summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2014-12-11 14:01:36 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2014-12-11 14:01:36 +0100
commitbed34f4f8b1120df4a8eb39e6ac4373060411ae7 (patch)
tree298789c2e6c8cdf95ac195489d999621af810641
parent57dd11afe9cb1b23ebe504127b5bf945b98e751d (diff)
xserver-xorg: use the xorg-CVE-2013-6424.patch
while at it remove the xserver-xorg.inc file in favour of the identical inc file in the openembedded-core layer.
-rw-r--r--recipes-graphics/xorg-xserver/xserver-xorg.inc154
-rw-r--r--recipes-graphics/xorg-xserver/xserver-xorg_1.14.7.bb3
2 files changed, 2 insertions, 155 deletions
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg.inc b/recipes-graphics/xorg-xserver/xserver-xorg.inc
deleted file mode 100644
index 2bacbe5..0000000
--- a/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ /dev/null
@@ -1,154 +0,0 @@
-SUMMARY = "The X.Org X server"
-HOMEPAGE = "http://www.x.org"
-SECTION = "x11/base"
-LICENSE = "MIT-X"
-LIC_FILES_CHKSUM = "file://COPYING;md5=15b5bf9327341c81089137aec4830bfd"
-
-# xf86-*-* packages depend on an X server built with the xfree86 DDX
-# so we have a virtual to represent that:
-# deprecated, we should use virtual/xserver instead
-PROVIDES = "virtual/xserver-xf86"
-
-# Other packages tend to just care that there is *an* X server:
-PROVIDES += "virtual/xserver"
-
-PE = "2"
-INC_PR = "r8"
-
-XORG_PN = "xorg-server"
-SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
-SRC_URI += "file://macro_tweak.patch"
-
-S = "${WORKDIR}/${XORG_PN}-${PV}"
-
-inherit autotools pkgconfig
-
-PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto presentproto"
-LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl libgcrypt"
-DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util"
-
-# Split out some modules and extensions from the main package
-# These aren't needed for basic operations and only take up space:
-# 32.0k libdri.so
-# 91.0k libexa.so
-# 336.0k libglx.so
-# 1360k libint10.so
-# 180.0k libwfb.so
-# 320.0k libxaa.so
-# 124.0k libxf1bpp.so
-# 84.0k libxf4bpp.so
-# librecord.so
-# libextmod.so
-# libdbe.so
-
-PACKAGES =+ "${PN}-security-policy \
- ${PN}-sdl \
- ${PN}-fbdev \
- ${PN}-xvfb \
- ${PN}-utils \
- ${PN}-xephyr \
- ${PN}-multimedia-modules \
- ${PN}-extension-dri \
- ${PN}-extension-dri2 \
- ${PN}-extension-glx \
- ${PN}-extension-record \
- ${PN}-extension-extmod \
- ${PN}-extension-dbe \
- ${PN}-module-libint10 \
- ${PN}-module-libafb \
- ${PN}-module-libwfb \
- ${PN}-module-libmfb \
- ${PN}-module-libcfb \
- ${PN}-module-exa \
- ${PN}-module-xaa \
- ${PN}-module-libxf1bpp \
- ${PN}-module-libxf4bpp"
-
-RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config xkbcomp"
-RDEPENDS_${PN}-xvfb += "xkeyboard-config"
-RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})"
-
-FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
-FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la"
-FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled ${localstatedir}/lib/xkb/README.compiled"
-FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
- ${libdir}/xorg/modules/*/.debug \
- ${libdir}/xorg/modules/*/*/.debug \
- "
-FILES_${PN}-security-policy += "${libdir}/xserver/SecurityPolicy"
-FILES_${PN}-sdl = "${bindir}/Xsdl"
-FILES_${PN}-fbdev = "${bindir}/Xfbdev"
-FILES_${PN}-xvfb = "${bindir}/Xvfb"
-FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
-FILES_${PN}-xephyr = "${bindir}/Xephyr"
-FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*"
-FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so"
-FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so"
-FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so"
-FILES_${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so"
-FILES_${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so"
-FILES_${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so"
-FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so"
-FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so"
-FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so"
-FILES_${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so"
-FILES_${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so"
-FILES_${PN}-module-exa = "${libdir}/xorg/modules/libexa.so"
-FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so"
-FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so"
-FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so"
-
-EXTRA_OECONF += "--with-fop=no \
- --without-xmlto \
- --with-pic \
- --disable-static \
- --disable-xinerama \
- --disable-record \
- --disable-dmx \
- --disable-xnest \
- --enable-xvfb \
- --enable-composite \
- --without-dtrace \
- --with-int10=x86emu \
- --sysconfdir=/etc/X11 \
- --localstatedir=/var \
- --with-xkb-output=/var/lib/xkb \
- ac_cv_file__usr_share_sgml_X11_defs_ent=no \
-"
-
-PACKAGECONFIG ??= "udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'dri dri2 glx', '', d)}"
-PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
-PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86driproto"
-PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto"
-PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,--disable-glx,glproto virtual/libgl virtual/libx11"
-
-do_install_append () {
- # Its assumed base-files creates this for us
- rmdir ${D}${localstatedir}/log/
-}
-
-# Add runtime provides for the ABI versions of the video and input subsystems,
-# so that drivers can depend on the relevant version.
-python populate_packages_prepend() {
- import subprocess
-
- # Set PKG_CONFIG_PATH so pkg-config looks at the .pc files that are going
- # into the new package, not the staged ones.
- newenv = dict(os.environ)
- newenv["PKG_CONFIG_PATH"] = d.expand("${PKGD}${libdir}/pkgconfig/")
-
- def get_abi(name):
- abis = {
- "video": "abi_videodrv",
- "input": "abi_xinput"
- }
- p = subprocess.Popen(args="pkg-config --variable=%s xorg-server" % abis[name],
- shell=True, env=newenv, stdout=subprocess.PIPE)
- output = p.communicate()[0]
- mlprefix = d.getVar('MLPREFIX', True) or ''
- return "%sxorg-abi-%s-%s" % (mlprefix, name, output.split(".")[0])
-
- pn = d.getVar("PN", True)
- d.appendVar("RPROVIDES_" + pn, " " + get_abi("input"))
- d.appendVar("RPROVIDES_" + pn, " " + get_abi("video"))
-}
diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.14.7.bb b/recipes-graphics/xorg-xserver/xserver-xorg_1.14.7.bb
index 742ca59..d3e8f89 100644
--- a/recipes-graphics/xorg-xserver/xserver-xorg_1.14.7.bb
+++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.14.7.bb
@@ -1,4 +1,4 @@
-require xserver-xorg.inc
+require recipes-graphics/xorg-xserver/xserver-xorg.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=bc098b9774ed096943f6c37b5beeef13"
@@ -7,6 +7,7 @@ SRC_URI += "file://crosscompile.patch \
file://fix_open_max_preprocessor_error.patch \
file://mips64-compiler.patch \
file://aarch64.patch \
+ file://xorg-CVE-2013-6424.patch \
"
SRC_URI[md5sum] = "0c285a813a6c3291c88d5a2b710aecb1"