* [PATCHv3 08/31] xserver-xorg-common: move shared PROTO_DEPS and LIB_DEPS from xserver-xorg.inc and xserver-xorg-lite.inc to xserver-xorg-common.inc
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318007055.git.Martin.Jansa@gmail.com>
* xserver-xorg.inc is appending extra xf86driproto dri2proto to PROTO_DEPS and virtual/libgl to LIB_DEPS
* both lite and dri variants now depend on font-util (from DEPENDS in xserver-xorg-common.inc)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xorg-common.inc | 4 ++++
.../xorg-xserver/xserver-xorg-lite.inc | 6 ------
.../recipes-graphics/xorg-xserver/xserver-xorg.inc | 7 ++-----
3 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 0a5d8b6..d901e2c 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -20,6 +20,10 @@ S = "${WORKDIR}/${XORG_PN}-${PV}"
inherit autotools pkgconfig
+PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
+LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
+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
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
index f1cef1b..a942a11 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
@@ -1,11 +1,5 @@
require xserver-xorg-common.inc
-PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
-
-LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
-
-DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
-
RDEPENDS_${PN} += "xorg-minimal-fonts"
FILES_${PN} += "${bindir}/Xorg "
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 9bc0ee4..71754f7 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -1,10 +1,7 @@
require xserver-xorg-common.inc
-PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
-
-LIB_DEPS = "pixman virtual/libgl libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl"
-
-DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
+PROTO_DEPS += "xf86driproto dri2proto"
+LIB_DEPS += "virtual/libgl"
RDEPENDS_${PN} += "xorg-minimal-fonts"
--
1.7.7
^ permalink raw reply related
* [PATCHv3 07/31] xserver-xorg-common: improve packaging
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318007055.git.Martin.Jansa@gmail.com>
* add ${bindir} and protocol.txt to ${PN}
* SecurityPolicy is now in ${PN}-security-policy
* package .la files to ${PN}-dev
* README.compiled is lately in ${localstatedir}/lib/xkb so add it too to ${PN}-doc
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xorg-common.inc | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index c0fcf8b..0a5d8b6 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -58,14 +58,13 @@ PACKAGES =+ "${PN}-security-policy \
RDEPENDS_${PN} += "xserver-xf86-config xkeyboard-config"
-FILES_${PN} = "${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/xorg/modules/*.so ${libdir}/xorg/modules/*/*.so ${libdir}/xorg/modules/*/*/*.so /etc/X11 "
-FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled"
-
+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 \
- "
-
+ ${libdir}/xorg/modules/*/*/.debug \
+ "
FILES_${PN}-security-policy += "${libdir}/xserver/SecurityPolicy"
FILES_${PN}-sdl = "${bindir}/Xsdl"
FILES_${PN}-fbdev = "${bindir}/Xfbdev"
--
1.7.7
^ permalink raw reply related
* [PATCHv3 06/31] xserver-xorg-common: Split out some bigger modules and extensions from the main package
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318007055.git.Martin.Jansa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xorg-common.inc | 60 +++++++++++++++++++-
1 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 67edbcf..c0fcf8b 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -20,11 +20,44 @@ S = "${WORKDIR}/${XORG_PN}-${PV}"
inherit autotools pkgconfig
-PACKAGES =+ "${PN}-utils"
+# 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
+# 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}-xprint \
+ ${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-xaa \
+ ${PN}-module-libxf1bpp \
+ ${PN}-module-libxf4bpp"
RDEPENDS_${PN} += "xserver-xf86-config xkeyboard-config"
-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} = "${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/xorg/modules/*.so ${libdir}/xorg/modules/*/*.so ${libdir}/xorg/modules/*/*/*.so /etc/X11 "
FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled"
@@ -33,6 +66,29 @@ FILES_${PN}-dbg += "${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}-xprint = "${libdir}/X11/xserver/*/print"
+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-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"
PACKAGECONFIG ??= "udev"
--
1.7.7
^ permalink raw reply related
* [PATCHv3 05/31] xserver-xorg-common: move SRC_URI closer together
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318007055.git.Martin.Jansa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xorg-common.inc | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 3a69d7d..67edbcf 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -14,6 +14,7 @@ PROVIDES += "virtual/xserver"
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}"
@@ -32,8 +33,6 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
${libdir}/xorg/modules/*/*/.debug \
"
-SRC_URI += "file://macro_tweak.patch"
-
EXTRA_OECONF = "--with-fop=no"
PACKAGECONFIG ??= "udev"
--
1.7.7
^ permalink raw reply related
* [PATCHv3 04/31] xserver-xorg-common: fix LIC_FILES_CHKSUM
From: Martin Jansa @ 2011-10-07 17:04 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318007055.git.Martin.Jansa@gmail.com>
* old value was actually from xserver-kdrive, use the same as
xserver-xorg-1.10.1 and newer has
./xserver-kdrive.inc:LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
./xserver-xorg-lite_1.10.1.bb:LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xorg-common.inc | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 78c5f2e..3a69d7d 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -2,8 +2,7 @@ DESCRIPTION = "The X.Org X server"
HOMEPAGE = "http://www.x.org"
SECTION = "x11/base"
LICENSE = "MIT-X"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
+LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
# xf86-*-* packages depend on an X server built with the xfree86 DDX
# so we have a virtual to represent that:
--
1.7.7
^ permalink raw reply related
* [PATCHv3 03/31] glx-use-tls.inc: add include file to enable glx-tls only when TARGET_OS isn't uclibc
From: Martin Jansa @ 2011-10-07 17:04 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318007055.git.Martin.Jansa@gmail.com>
* will be used in mesa-common.inc and xserver-xorg.inc
* based on mesa-tls.inc (glx-use-tls.bbclass) from
http://git.openembedded.org/cgit.cgi/openembedded/commit/packages/mesa/mesa-tls.inc?id=b527d8f723c98c77f2f5c5358062e5348493d767
---
meta/recipes-graphics/mesa/glx-use-tls.inc | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-graphics/mesa/glx-use-tls.inc
diff --git a/meta/recipes-graphics/mesa/glx-use-tls.inc b/meta/recipes-graphics/mesa/glx-use-tls.inc
new file mode 100644
index 0000000..7530872
--- /dev/null
+++ b/meta/recipes-graphics/mesa/glx-use-tls.inc
@@ -0,0 +1,7 @@
+def get_tls_setting(bb, d):
+ # until we have no prober TLS support in uclibc disable it
+ if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0 :
+ return ""
+ return "--enable-glx-tls"
+
+EXTRA_OECONF += "${@get_tls_setting(bb, d)}"
--
1.7.7
^ permalink raw reply related
* [PATCHv3 02/31] xserver-xorg: remove old git recipe
From: Martin Jansa @ 2011-10-07 17:04 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318007055.git.Martin.Jansa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
.../xorg-xserver/xserver-xorg_git.bb | 25 --------------------
1 files changed, 0 insertions(+), 25 deletions(-)
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
deleted file mode 100644
index beef06a..0000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require xserver-xorg.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
-
-SRCREV = "6689e8add183835274a70ee013e5d3bc8023681f"
-PE = "1"
-PR = "r3"
-PV = "1.10+git${SRCPV}"
-
-PROTO_DEPS += "xf86driproto dri2proto"
-
-DEPENDS += "font-util"
-
-RDEPENDS_${PN} += "xkeyboard-config"
-
-SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git;branch=master \
- file://crosscompile.patch; \
- file://fix_macros1.patch;"
-
-# Misc build failure for master HEAD
-SRC_URI += "file://fix_open_max_preprocessor_error.patch;"
-
-EXTRA_OECONF += "--enable-dri --enable-dri2 --enable-dga"
-
-S = "${WORKDIR}/git"
--
1.7.7
^ permalink raw reply related
* [PATCHv3 01/31] xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
From: Martin Jansa @ 2011-10-07 17:04 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1318007055.git.Martin.Jansa@gmail.com>
* xserver-xorg is closer to upstream naming and
that's how it's named in OE-classic and meta-oe? It would make meta-oe
transition easier and better to do it now then convert meta-oe to
xserver-xf86 and then rename it back later.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
meta/conf/distro/include/default-providers.inc | 4 ++--
.../conf/distro/include/distro_tracking_fields.inc | 20 ++++++++++----------
meta/conf/machine/qemux86-64.conf | 6 +++---
meta/conf/machine/qemux86.conf | 6 +++---
meta/conf/multilib.conf | 2 +-
...ver-xf86-common.inc => xserver-xorg-common.inc} | 1 +
...xserver-xf86-lite.inc => xserver-xorg-lite.inc} | 4 +---
.../crosscompile.patch | 0
.../fix_open_max_preprocessor_error.patch | 0
.../macro_tweak.patch | 2 +-
...-lite_1.10.1.bb => xserver-xorg-lite_1.10.1.bb} | 2 +-
...{xserver-xf86-dri-lite.inc => xserver-xorg.inc} | 2 +-
.../cache-xkbcomp-output-for-fast-start-up.patch | 0
.../crosscompile.patch | 0
.../fix_macros1.patch | 0
.../fix_open_max_preprocessor_error.patch | 0
.../macro_tweak.patch | 2 +-
...6-dri-lite_1.10.1.bb => xserver-xorg_1.10.1.bb} | 2 +-
...er-xf86-dri-lite_git.bb => xserver-xorg_git.bb} | 2 +-
19 files changed, 27 insertions(+), 28 deletions(-)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-common.inc => xserver-xorg-common.inc} (96%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite.inc => xserver-xorg-lite.inc} (95%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg-lite}/crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite => xserver-xorg-lite}/fix_open_max_preprocessor_error.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite => xserver-xorg-lite}/macro_tweak.patch (93%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite_1.10.1.bb => xserver-xorg-lite_1.10.1.bb} (89%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite.inc => xserver-xorg.inc} (97%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/cache-xkbcomp-output-for-fast-start-up.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite => xserver-xorg}/crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/fix_macros1.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/fix_open_max_preprocessor_error.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/macro_tweak.patch (93%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.10.1.bb => xserver-xorg_1.10.1.bb} (93%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_git.bb => xserver-xorg_git.bb} (94%)
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index d51ac64..a5cdb5b 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -3,8 +3,8 @@
#
PREFERRED_PROVIDER_virtual/db ?= "db"
PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 7b6c4a9..8af80c7 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -3683,14 +3683,14 @@ RECIPE_INTEL_SECTION_pn-mesa-xlib="graphic core"
RECIPE_LAST_UPDATE_pn-mesa-xlib = "Nov 27, 2010"
RECIPE_MAINTAINER_pn-mesa-xlib="Yu Ke <ke.yu@intel.com>"
-RECIPE_STATUS_pn-xserver-xf86-dri-lite="green" # no update needed
-RECIPE_LATEST_VERSION_pn-xserver-xf86-dri-lite="1.8.99.904"
-RECIPE_NO_OF_PATCHES_pn-xserver-xf86-dri-lite="2"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xf86-dri-lite="2 monthes"
-RECIPE_LATEST_RELEASE_DATE_pn-xserver-xf86-dri-lite="2010/07/01"
-RECIPE_INTEL_SECTION_pn-xserver-xf86-dri-lite="graphic core"
-RECIPE_LAST_UPDATE_pn-xserver-xf86-dri-lite = "Jan 18, 2011"
-RECIPE_MAINTAINER_pn-xserver-xf86-dri-lite="Yu Ke <ke.yu@intel.com>"
+RECIPE_STATUS_pn-xserver-xorg="green" # no update needed
+RECIPE_LATEST_VERSION_pn-xserver-xorg="1.8.99.904"
+RECIPE_NO_OF_PATCHES_pn-xserver-xorg="2"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-xserver-xorg="2 monthes"
+RECIPE_LATEST_RELEASE_DATE_pn-xserver-xorg="2010/07/01"
+RECIPE_INTEL_SECTION_pn-xserver-xorg="graphic core"
+RECIPE_LAST_UPDATE_pn-xserver-xorg = "Jan 18, 2011"
+RECIPE_MAINTAINER_pn-xserver-xorg="Yu Ke <ke.yu@intel.com>"
RECIPE_STATUS_pn-xf86-input-synaptics = "red"
DISTRO_PN_ALIAS_pn-xf86-input-synaptics = "Meego=xorg-x11-drv-synaptics Fedora=xorg-x11-drv-synaptics Ubuntu=xserver-xorg-input-synaptics Mandriva=x11-driver-input-synaptics Debian=xfree86-driver-synaptics"
@@ -5908,8 +5908,8 @@ DISTRO_PN_ALIAS_pn-pseudo = "Windriver"
DISTRO_PN_ALIAS_pn-btrfs-tools = "Debian=btrfs-tools Fedora=btrfs-progs"
DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu=rt-tests"
-DISTRO_PN_ALIAS_pn-xserver-xf86-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
-DISTRO_PN_ALIAS_pn-xserver-xf86-dri-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
+DISTRO_PN_ALIAS_pn-xserver-xorg = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
+DISTRO_PN_ALIAS_pn-xserver-xorg = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
DISTRO_PN_ALIAS_pn-xserver-kdrive = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
DISTRO_PN_ALIAS_pn-dtc = "Fedora=dtc Ubuntu=dtc"
DISTRO_PN_ALIAS_pn-dtc-native = "Fedora=dtc Ubuntu=dtc"
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 18a7513..f28cf08 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -4,8 +4,8 @@
PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
require conf/machine/include/tune-x86_64.inc
require conf/machine/include/qemu.inc
@@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "bzImage"
SERIAL_CONSOLE = "115200 ttyS0"
# We bypass swrast but we need it to be present for X to load correctly
-XSERVER ?= "xserver-xf86-dri-lite \
+XSERVER ?= "xserver-xorg \
mesa-dri-driver-swrast \
xf86-input-vmmouse \
xf86-input-keyboard \
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 5d0d03e..75c9042 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -4,8 +4,8 @@
PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
require conf/machine/include/tune-i586.inc
require conf/machine/include/qemu.inc
@@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "bzImage"
SERIAL_CONSOLE = "115200 ttyS0"
# We bypass swrast but we need it to be present for X to load correctly
-XSERVER ?= "xserver-xf86-dri-lite \
+XSERVER ?= "xserver-xorg \
mesa-dri-driver-swrast \
xf86-input-vmmouse \
xf86-input-keyboard \
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index b9da33a..5e4b435 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -442,7 +442,7 @@ BBCLASSEXTEND_append_pn-xrandr = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-xrestop = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-xserver-nodm-init = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-xserver-xf86-config = " ${MULTILIBS}"
-BBCLASSEXTEND_append_pn-xserver-xf86-dri-lite = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-xserver-xorg = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-xset = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-xtrans = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-xtscal = " ${MULTILIBS}"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
similarity index 96%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 17d456c..78c5f2e 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
# 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:
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
similarity index 95%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
index 131c258..f1cef1b 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
@@ -1,6 +1,4 @@
-require xserver-xf86-common.inc
-
-PROVIDES += "xserver-xf86-lite"
+require xserver-xorg-common.inc
PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/crosscompile.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/crosscompile.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/fix_open_max_preprocessor_error.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/fix_open_max_preprocessor_error.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/fix_open_max_preprocessor_error.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
similarity index 93%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
index 2b75427..2b32d4e 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/macro_tweak.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite/macro_tweak.patch
@@ -2,7 +2,7 @@ This is the revised version of files/macro_tweak.patch for
xorg-server 1.8.99.904.
the files/macro_tweak.patch can not removed now since it is used by
-xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they
+xserver-kdrive-1.7.99.2 and xserver-xorg(-lite). Once they
are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
can be safely replace by this patch.
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
similarity index 89%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
index e42f27d..63b2c38 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.10.1.bb
@@ -1,4 +1,4 @@
-require xserver-xf86-lite.inc
+require xserver-xorg-lite.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
similarity index 97%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 6b13873..9bc0ee4 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -1,4 +1,4 @@
-require xserver-xf86-common.inc
+require xserver-xorg-common.inc
PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86rushproto xf86vidmodeproto xf86bigfontproto compositeproto recordproto resourceproto videoproto scrnsaverproto evieext trapproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto glproto"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/cache-xkbcomp-output-for-fast-start-up.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg/cache-xkbcomp-output-for-fast-start-up.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_macros1.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_macros1.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch
similarity index 100%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
similarity index 93%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
index 2b75427..2b32d4e 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch
@@ -2,7 +2,7 @@ This is the revised version of files/macro_tweak.patch for
xorg-server 1.8.99.904.
the files/macro_tweak.patch can not removed now since it is used by
-xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they
+xserver-kdrive-1.7.99.2 and xserver-xorg(-lite). Once they
are all upgraded to 1.8.99.904, the the files/macro_tweak.patch
can be safely replace by this patch.
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
similarity index 93%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
index b797f97..0194798 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb
@@ -1,4 +1,4 @@
-require xserver-xf86-dri-lite.inc
+require xserver-xorg.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
similarity index 94%
rename from meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
rename to meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
index 87ba040..beef06a 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_git.bb
@@ -1,4 +1,4 @@
-require xserver-xf86-dri-lite.inc
+require xserver-xorg.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
--
1.7.7
^ permalink raw reply related
* [PATCHv3 00/31] Xorg related changes
From: Martin Jansa @ 2011-10-07 17:05 UTC (permalink / raw)
To: openembedded-core
this patchset brings meta-oe and oe-core xorg stuff together and most of
xorg recipes will be removed from meta-oe (sending another pull request now).
This step is needed to be able to separate common x11 to meta-x11 or whatever later.
The following changes since commit 808b3123e359f1aebabb8af44694275e4075e031:
gnutls: Disable p11-kit dependency explicitly to resolve build failures (2011-10-07 15:40:42 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib jansa/x11-v2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/x11-v2
Martin Jansa (31):
xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
xserver-xorg: remove old git recipe
glx-use-tls.inc: add include file to enable glx-tls only when
TARGET_OS isn't uclibc
xserver-xorg-common: fix LIC_FILES_CHKSUM
xserver-xorg-common: move SRC_URI closer together
xserver-xorg-common: Split out some bigger modules and extensions
from the main package
xserver-xorg-common: improve packaging
xserver-xorg-common: move shared PROTO_DEPS and LIB_DEPS from
xserver-xorg.inc and xserver-xorg-lite.inc to
xserver-xorg-common.inc
xserver-xorg-common: lower xserver-xf86-config and xkeyboard-config
dependency to RRECOMMENDS and add few more recipes to RRECOMMENDS
xserver-xorg-common: move RDEPENDS_${PN} += xorg-minimal-fonts to
shared .inc
xserver-xorg: remove FILES_${PN} += "${bindir}/Xorg ", now we have
whole ${bindir} in FILES_ defined in shared .inc
xserver-xorg: replace hardcoded --enable-glx-tls with
glx-use-tls.inc, which doesn't enable it for uClibc
xserver-xorg: move shared EXTRA_OECONF entries to shared .inc
xserver-xorg: add new version 1.11.1
xserver-xorg: remove old 1.10.1 version
xserver-xorg: remove COMPATIBLE_HOST
xserver-xorg: drop unused files
xserver-xorg: move patches to xserver-xf86-dri-lite-1.11.1 and use
same directory from xserver-xf86-lite recipe
xserver-kdrive: drop unused files (same files are in
xserver-kdrive-1.7.99.2 directory
xorg-driver-common.inc: use virtual/xserver instead of older
virtual/xserver-xf86
xorg-driver-common.inc: bump INC_PR to rebuild drivers agains new
xserver-xorg ABI
libx11: package xcb, merge few changes from meta-oe
libx11: add new version 1.4.4
libx11: remove older 1.3.4
libx11: drop old 1.2.2 git version
libx11-trim: move files for libx11-trim from libx11-1.3.4 to
libx11-trim-1.3.4
libx11-diet: move old patches used only by libx11-diet-1.3 to
separate directory
mesa: add mesa-dri.inc and mesa-xlib.inc with shared options, move
uclibc.patch
mesa-dri-glsl-native: drop recipe which wasn't usefull since 7.8.2
was removed
mesa: add new version 7.11
mesa: drop older 7.10.2 and 7.7+git recipes
meta/conf/distro/include/default-providers.inc | 4 +-
.../conf/distro/include/distro_tracking_fields.inc | 20 +-
meta/conf/machine/qemux86-64.conf | 6 +-
meta/conf/machine/qemux86.conf | 6 +-
meta/conf/multilib.conf | 2 +-
meta/recipes-graphics/mesa/glx-use-tls.inc | 7 +
meta/recipes-graphics/mesa/mesa-7.11.inc | 15 +
meta/recipes-graphics/mesa/mesa-common.inc | 36 ++-
.../mesa/mesa-dri-glsl-native_7.11.bb | 28 +
.../mesa/mesa-dri-glsl-native_7.8.2.bb | 27 -
meta/recipes-graphics/mesa/mesa-dri.inc | 22 +
meta/recipes-graphics/mesa/mesa-dri/cross2.patch | 46 --
meta/recipes-graphics/mesa/mesa-dri/crossfix.patch | 18 -
meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h | 162 ------
meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb | 40 --
meta/recipes-graphics/mesa/mesa-dri_7.11.bb | 4 +
meta/recipes-graphics/mesa/mesa-dri_git.bb | 57 --
meta/recipes-graphics/mesa/mesa-xlib.inc | 1 +
meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb | 22 -
meta/recipes-graphics/mesa/mesa-xlib_7.11.bb | 4 +
.../mesa/{mesa-dri => mesa}/uclibc.patch | 0
.../xorg-driver/xorg-driver-common.inc | 4 +-
.../xorg-lib/libx11-1.4.4/keysymdef_include.patch | 23 +
.../libx11-1.4.4/x11_disable_makekeys.patch | 29 +
.../{libx11 => libx11-diet-1.3}/X18NCMSstubs.diff | 0
.../fix-disable-xlocale.diff | 0
.../fix-utf8-wrong-define.patch | 0
.../include_fix.patch | 0
.../{libx11-git => libx11-diet-1.3}/nodolt.patch | 0
.../x11_disable_makekeys.patch | 0
meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb | 3 +-
meta/recipes-graphics/xorg-lib/libx11-diet_git.bb | 17 -
.../xorg-lib/libx11-git/X18NCMSstubs.diff | 570 --------------------
.../xorg-lib/libx11-git/x11_disable_makekeys.patch | 30 -
.../include_fix.patch | 0
.../makekeys_crosscompile.patch | 0
.../nodolt.patch | 0
.../x11_disable_makekeys.patch | 0
.../xorg-lib/libx11-trim/include_fix.patch | 25 -
.../xorg-lib/libx11-trim/nodolt.patch | 14 -
.../recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb | 10 +-
meta/recipes-graphics/xorg-lib/libx11-trim_git.bb | 13 -
meta/recipes-graphics/xorg-lib/libx11.inc | 25 +-
.../xorg-lib/libx11/fix-disable-xlocale.diff | 16 -
.../xorg-lib/libx11/fix-utf8-wrong-define.patch | 17 -
.../xorg-lib/libx11/include_fix.patch | 25 -
meta/recipes-graphics/xorg-lib/libx11/nodolt.patch | 14 -
.../xorg-lib/libx11/x11_disable_makekeys.patch | 31 --
meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb | 35 --
meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb | 18 +
meta/recipes-graphics/xorg-lib/libx11_git.bb | 14 -
meta/recipes-graphics/xorg-lib/libx11_git.inc | 11 -
.../xorg-xserver/files/macro_tweak.patch | 20 -
.../xorg-xserver/xserver-kdrive/disable-apm.patch | 24 -
.../xserver-kdrive/disable-xf86-dga-xorgcfg.patch | 43 --
.../xorg-xserver/xserver-kdrive/extra-kmodes.patch | 87 ---
.../xserver-kdrive/fbdev_xrandr_ioctl.patch | 63 ---
.../xserver-kdrive/no-serial-probing.patch | 17 -
.../xorg-xserver/xserver-xf86-common.inc | 42 --
.../xorg-xserver/xserver-xf86-dri-lite.inc | 36 --
.../cache-xkbcomp-output-for-fast-start-up.patch | 360 ------------
.../xserver-xf86-dri-lite/fix_macros1.patch | 24 -
.../fix_open_max_preprocessor_error.patch | 15 -
.../xserver-xf86-dri-lite/macro_tweak.patch | 30 -
.../xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb | 20 -
.../xorg-xserver/xserver-xf86-dri-lite_git.bb | 25 -
.../xorg-xserver/xserver-xf86-lite.inc | 34 --
.../xserver-xf86-lite/crosscompile.patch | 22 -
.../xorg-xserver/xserver-xf86-lite_1.10.1.bb | 12 -
.../xorg-xserver/xserver-xorg-1.11.1.inc | 7 +
.../crosscompile.patch | 0
.../fix_open_max_preprocessor_error.patch | 0
.../macro_tweak.patch | 7 +-
.../xorg-xserver/xserver-xorg-common.inc | 121 +++++
.../xorg-xserver/xserver-xorg-lite.inc | 6 +
.../xorg-xserver/xserver-xorg-lite_1.11.1.bb | 4 +
.../recipes-graphics/xorg-xserver/xserver-xorg.inc | 13 +
.../xorg-xserver/xserver-xorg_1.11.1.bb | 4 +
78 files changed, 381 insertions(+), 2126 deletions(-)
create mode 100644 meta/recipes-graphics/mesa/glx-use-tls.inc
create mode 100644 meta/recipes-graphics/mesa/mesa-7.11.inc
create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.11.bb
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_7.8.2.bb
create mode 100644 meta/recipes-graphics/mesa/mesa-dri.inc
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri/cross2.patch
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri/crossfix.patch
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri/i586/matypes.h
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb
create mode 100644 meta/recipes-graphics/mesa/mesa-dri_7.11.bb
delete mode 100644 meta/recipes-graphics/mesa/mesa-dri_git.bb
create mode 100644 meta/recipes-graphics/mesa/mesa-xlib.inc
delete mode 100644 meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
create mode 100644 meta/recipes-graphics/mesa/mesa-xlib_7.11.bb
rename meta/recipes-graphics/mesa/{mesa-dri => mesa}/uclibc.patch (100%)
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.4.4/keysymdef_include.patch
create mode 100644 meta/recipes-graphics/xorg-lib/libx11-1.4.4/x11_disable_makekeys.patch
rename meta/recipes-graphics/xorg-lib/{libx11 => libx11-diet-1.3}/X18NCMSstubs.diff (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-git => libx11-diet-1.3}/fix-disable-xlocale.diff (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-git => libx11-diet-1.3}/fix-utf8-wrong-define.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-git => libx11-diet-1.3}/include_fix.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-git => libx11-diet-1.3}/nodolt.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-trim => libx11-diet-1.3}/x11_disable_makekeys.patch (100%)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/X18NCMSstubs.diff
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-git/x11_disable_makekeys.patch
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 => libx11-trim-1.3.4}/include_fix.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 => libx11-trim-1.3.4}/makekeys_crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 => libx11-trim-1.3.4}/nodolt.patch (100%)
rename meta/recipes-graphics/xorg-lib/{libx11-1.3.4 => libx11-trim-1.3.4}/x11_disable_makekeys.patch (100%)
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim/include_fix.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim/nodolt.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/fix-disable-xlocale.diff
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/fix-utf8-wrong-define.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/include_fix.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/nodolt.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11/x11_disable_makekeys.patch
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
create mode 100644 meta/recipes-graphics/xorg-lib/libx11_1.4.4.bb
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_git.bb
delete mode 100644 meta/recipes-graphics/xorg-lib/libx11_git.inc
delete mode 100644 meta/recipes-graphics/xorg-xserver/files/macro_tweak.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-apm.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/disable-xf86-dga-xorgcfg.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/extra-kmodes.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/fbdev_xrandr_ioctl.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-kdrive/no-serial-probing.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/cache-xkbcomp-output-for-fast-start-up.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_macros1.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.10.1.bb
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite/crosscompile.patch
delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xf86-lite_1.10.1.bb
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.1.inc
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg-1.11.1}/crosscompile.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite => xserver-xorg-1.11.1}/fix_open_max_preprocessor_error.patch (100%)
rename meta/recipes-graphics/xorg-xserver/{xserver-xf86-lite => xserver-xorg-1.11.1}/macro_tweak.patch (74%)
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-lite_1.11.1.bb
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb
--
1.7.7
^ permalink raw reply
* Re: Convoluted dependencies
From: Otavio Salvador @ 2011-10-07 16:54 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1317996588.2405.18.camel@ted>
On Fri, Oct 7, 2011 at 11:09, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
...
> gettext-native -> libxml2-native -> python-native
> (hence gettext takes a *long* time to be built)
> What uses the python xml bindings?
...
Maybe a gettext-python-native or similar might be created if something
required the xml bindings for something.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
^ permalink raw reply
* Re: Convoluted dependencies
From: Saul Wold @ 2011-10-07 16:34 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1317996588.2405.18.camel@ted>
On 10/07/2011 07:09 AM, Richard Purdie wrote:
> I've been trying to figure out why our builds take as long as they do.
> It appears our dependency chains are getting more and more convoluted
> and this certainly isn't helping things. Specific pain points look like:
>
> bison-native -> gettext-native
> flex-native -> gettext-native
> (which limits binutils-cross)
>
> gettext-native -> libxml2-native -> python-native
> (hence gettext takes a *long* time to be built)
> What uses the python xml bindings?
>
I thought that by having the --with-included-libxml, we got rid of the
libxml2-native dependency, we should investigate that further.
Digging shows that it is needed for python to create the xml2po tool for
doc translation.
Sau!
> pseudo-native -> sqlite3-native
> (dragging out the time our effectively single threaded init takes)
>
> I'm mentioning this in case anyone has good ideas for fixing some of
> these...
>
> Cheers,
>
> Richard
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
^ permalink raw reply
* Re: [PATCH 2/6] Fix perl for powerpc64 build
From: McClintock Matthew-B29882 @ 2011-10-07 16:07 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1318002781.8533.16.camel@ted>
On Fri, Oct 7, 2011 at 10:52 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> Do you still need this bit:
>
> case "${TARGET_ARCH}" in
> - x86_64 | powerpc | s390)
> + x86_64 | powerpc | powerpc64 | s390)
> sed -i -e "s,\(need_va_copy=\)'undef',\1'define',g" \
> config.sh-${TARGET_ARCH}-${TARGET_OS}
> ;;
Missing this does not seem to affect things negatively so far, I've
been build testing mostly though - will revisit this later if
something comes up.
-M
^ permalink raw reply
* Re: [PATCH 2/6] Fix perl for powerpc64 build
From: Richard Purdie @ 2011-10-07 15:52 UTC (permalink / raw)
To: McClintock Matthew-B29882,
Patches and discussions about the oe-core layer
In-Reply-To: <CAEsOVNdUTaVc1NR0hDH7PU1gVCXotJWEJquiz=EMQXQ231GmzA@mail.gmail.com>
On Wed, 2011-10-05 at 19:04 +0000, McClintock Matthew-B29882 wrote:
> On Wed, Oct 5, 2011 at 6:46 AM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> >> --- a/meta/recipes-devtools/perl/perl_5.12.3.bb
> >> +++ b/meta/recipes-devtools/perl/perl_5.12.3.bb
> >> @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://Copying;md5=2b4c6ffbcfcbdee469f02565f253d81a \
> >> # We need gnugrep (for -I)
> >> DEPENDS = "virtual/db grep-native"
> >> DEPENDS += "gdbm zlib"
> >> -PR = "r5"
> >> +PR = "r6"
> >>
> >> # 5.10.1 has Module::Build built-in
> >> PROVIDES += "libmodule-build-perl"
> >> @@ -95,6 +95,8 @@ export LDDLFLAGS = "${LDFLAGS} -shared"
> >> # We're almost Debian, aren't we?
> >> CFLAGS += "-DDEBIAN"
> >>
> >> +export ARCH_powerpc64 = "powerpc64"
> >> +
> >
> > I'm finding it really hard to believe this makes any difference. I just
> > tried a powerpc64 build here and perl built fine. I can't find any
> > evidence for any part of the perl build using an ARCH variable
> > (TARGET_ARCH is used but that isn't ARCH).
> >
> > Can you give some further information about how/where this is used?
>
> I'm trying to reproduce this again on 'edison' as well and it does not
> appear to be occurring anymore! The problem before had to do with a
> configuration script error:
>
> config.sh-powerpc64-linux
>
> This script was getting invoked as 'config.sh-powerpc-linux' on the
> 64bit build, then the file did not exist and the configure step failed
> out. Not sure if this was somehow fixed in a different manner.
>
> Please drop this patch for now. I'll bring it up again if I see issues.
Do you still need this bit:
case "${TARGET_ARCH}" in
- x86_64 | powerpc | s390)
+ x86_64 | powerpc | powerpc64 | s390)
sed -i -e "s,\(need_va_copy=\)'undef',\1'define',g" \
config.sh-${TARGET_ARCH}-${TARGET_OS}
;;
?
Cheers,
Richard
^ permalink raw reply
* Re: pkg-config bug crashes 'bitbake glib-2.0-native' in FC15.x86_64
From: Richard Purdie @ 2011-10-07 15:10 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <CADWjqk4vMeDa12__Ckg=v_eYb38hQkrx9JQfi25wh58eE5G7YA@mail.gmail.com>
On Thu, 2011-10-06 at 02:38 -0600, dashesy wrote:
> On Wed, Oct 5, 2011 at 4:05 AM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > On Wed, 2011-10-05 at 11:01 +0100, Richard Purdie wrote:
> >> On Wed, 2011-10-05 at 03:21 -0600, dashesy wrote:
> >> > Hi,
> >> >
> >> > I am using these in my local.conf with master branch of oe-core:
> >> > DISTRO="angstrom-2010.x"
> >> > MACHINE="beagleboard"
> >> >
> >> > The build for 'bitbake glib-2.0-native' (or actually 'bitbake
> >> > meta-toolchain') will finally reach a run.do_configure for 'package
> >> > glib-2.0-native-1_2.28.8-r5: task do_configure: Started'
> >> > which runs the "oe-core/build/tmp-eglibc/sysroots/x86_64-linux/usr/bin/pkg-config"
> >> > for auto build
> >> > This leads to the following chain
> >> > pkg-config(cross)->gnome-config->pkg-config->glib-config->pkg-config->...
> >> >
> >> > dashesy 21266 21265 21266 0 1 01:56 pts/0 00:00:00 /bin/sh -e
> >> > /home/dashesy/buildroot/oe-core/build/tmp-eglibc/work/x86_64-linux/glib-2.0-native-1_2.28.8-r5/temp/run.do_configure.21265
> >> > root 21870 935 21870 0 1 01:56 ? 00:00:00 sleep 60
> >> > dashesy 22246 21266 22246 0 1 01:56 pts/0 00:00:00 /bin/sh
> >> > /home/dashesy/buildroot/oe-core/build/tmp-eglibc/work/x86_64-linux/glib-2.0-native-1_2.28.8-r5/glib-2.28.8/configure
[...]
> >> > --disable-silent-rules --disable-dependency-tracking --disable-dtrace
> >> > --disable-systemtap --enable-nls --enable-dtrace=no
> >> > dashesy 22671 22246 22671 0 1 01:56 pts/0 00:00:00
> >> > /home/dashesy/buildroot/oe-core/build/tmp-eglibc/sysroots/x86_64-linux/usr/bin/pkg-config
> >> > --exists --print-errors zlib
> >> > dashesy 22672 22671 22672 0 1 01:56 pts/0 00:00:00 sh -c
> >> > gnome-config --libs zlib > /dev/null 2>&1
> >>
> >> Something odd is happening here. We have a patch in OE-Core against
> >> pkg-config which should disable "leagacy" pkg-config functionality.
> >>
> >> I took a look and it somehow looks like the patch got broken. Could you
> >> try again with
> >>
> >> http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/wip8&id=de51d6ffae1d6a4f594687d5bdef25e731f44dfa
> >>
> >> applied please? I think this should fix this problem.
> >
> > Sorry, this should be:
> >
> > http://git.yoctoproject.org/cgit.cgi/poky-contrib/commit/?h=rpurdie/wip8&id=8d04d67271e5698ede8c08d3b6e3d4d7e38ffb0c
> >
>
> The patch worked, no more recursive calls and bitbake succeeds too, thanks!
Thanks for testing. The fix has been merged into master.
Cheers,
Richard
^ permalink raw reply
* Re: [WIP][PATCH 8/9] glib: upgrade to 2.30.0
From: Richard Purdie @ 2011-10-07 15:05 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <e27a2c33117539c39c8c9961d0e16ca5c0bdff89.1317397204.git.Martin.Jansa@gmail.com>
On Fri, 2011-09-30 at 17:43 +0200, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> ...003-gatomic-proper-pointer-get-cast.patch.patch | 28 ----------
> .../0005-glib-mkenums-interpreter.patch.patch | 25 ---------
> .../60_wait-longer-for-threads-to-die.patch | 24 +++++-----
> meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch | 2 -
> .../glib-2.0/remove.test.for.qsort_r.patch | 53 ++++++++++++++++++++
> meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb | 23 ---------
> meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb | 41 +++++++++++++++
> 7 files changed, 106 insertions(+), 90 deletions(-)
> delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
> delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
> create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
> delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb
> create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
> +DEPENDS += "libffi python-argparse-native"
> +DEPENDS_virtclass-native += "libffi-native python-argparse-native"
Just to be clear on the status of this, the above dependencies present a
problem for OE-Core :(
Cheers,
Richard
^ permalink raw reply
* Re: [PATCH] gnutls: disable p11-kit
From: Richard Purdie @ 2011-10-07 14:42 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Koen Kooi
In-Reply-To: <1317998259-4330-1-git-send-email-koen@dominion.thruhere.net>
On Fri, 2011-10-07 at 16:37 +0200, Koen Kooi wrote:
> | checking for P11_KIT... configure: error: Package requirements (p11-kit-1 >= 0.2) were not met:
> |
> | No package 'p11-kit-1' found
> |
> | Consider adjusting the PKG_CONFIG_PATH environment variable if you
> | installed software in a non-standard prefix.
> |
> | Alternatively, you may set the environment variables P11_KIT_CFLAGS
> | and P11_KIT_LIBS to avoid the need to call pkg-config.
> | See the pkg-config man page for more details.
> |
> | + bbfatal 'oe_runconf failed'
>
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
> meta/recipes-support/gnutls/gnutls.inc | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
I had a similar patch pending too. I've just expedited the fix to
master...
Cheers,
Richard
^ permalink raw reply
* [PATCH] gnutls: disable p11-kit
From: Koen Kooi @ 2011-10-07 14:37 UTC (permalink / raw)
To: openembedded-core; +Cc: Koen Kooi
| checking for P11_KIT... configure: error: Package requirements (p11-kit-1 >= 0.2) were not met:
|
| No package 'p11-kit-1' found
|
| Consider adjusting the PKG_CONFIG_PATH environment variable if you
| installed software in a non-standard prefix.
|
| Alternatively, you may set the environment variables P11_KIT_CFLAGS
| and P11_KIT_LIBS to avoid the need to call pkg-config.
| See the pkg-config man page for more details.
|
| + bbfatal 'oe_runconf failed'
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
meta/recipes-support/gnutls/gnutls.inc | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index 9257880..67e44ba 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/gnutls/"
BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls"
DEPENDS = "zlib lzo libtasn1 libgcrypt (>= 1.4.2) libcap"
-INC_PR = "r2"
+INC_PR = "r3"
LICENSE = "GPLv3+ & LGPLv2.1+"
LICENSE_${PN} = "LGPLv2.1+"
@@ -25,6 +25,7 @@ EXTRA_OECONF="--with-included-opencdk --with-included-libcfg --disable-rpath \
--with-libdl-prefix=${STAGING_DIR_HOST}${prefix} \
--with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \
--with-lzo --disable-guile \
+ --without-p11-kit \
"
do_configure_prepend() {
for dir in . lib libextra; do
--
1.6.6.1
^ permalink raw reply related
* Re: [PATCH v2] util-linux: split fsck* into its own subpackage
From: Richard Purdie @ 2011-10-07 14:36 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Koen Kooi
In-Reply-To: <1317913185-11345-1-git-send-email-koen@dominion.thruhere.net>
On Thu, 2011-10-06 at 16:59 +0200, Koen Kooi wrote:
> This will allow systemd to run /sbin/fsck without dragging in all of util-linux
>
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
> meta/recipes-core/util-linux/util-linux.inc | 16 +++++++++++++---
> meta/recipes-core/util-linux/util-linux_2.19.1.bb | 2 +-
> 2 files changed, 14 insertions(+), 4 deletions(-)
Merged to master, thanks.
Richard
^ permalink raw reply
* Re: [PATCH 00/21] Add SRC_URI Checksums and some Updates
From: Richard Purdie @ 2011-10-07 14:35 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <cover.1317917297.git.sgw@linux.intel.com>
On Thu, 2011-10-06 at 09:14 -0700, Saul Wold wrote:
> Richard,
>
> Found some recipes missing Checksums and do a couple of
> package updates.
>
> Thanks
> Sau!
>
> The following changes since commit cc626b9e1671670a931ea3e528ea4b0f7b2e923b:
>
> webkit-gtk: Enable dependency tracking since the webkit makefiles have bugs (2011-10-05 14:36:18 +0100)
>
> are available in the git repository at:
> git://git.openembedded.org/openembedded-core-contrib sgw/updates
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/updates
>
> Saul Wold (21):
> grub: Add SRC_URI Checksum
> dosfstools: Add SRC_URI Checksum
> libx11-trim: Add SRC_URI Checksum
> guilt-native: Add SRC_URI Checksums
> libx11-diet: Add SRC_URI Checksum
> eds-tools: Convert from BZR to GIT Repo
> clutter-gst-1.6: Add SRC_URI Checksum
> xserver-kdrive: Add SRC_URI Checksum
> mutter: Add SRC_URI Checksum
> icon-naming-utils: Add SRC_URI Checksum
> libxml-perl: Add SRC_URI Checksum
> liburi-perl: Add SRC_URI Checksum
> gconf-dbus: Add SRC_URI Checksum
> gail: Add SRC_URI Checksum
> boost-jam-native: Add SRC_URI Checksum
> puzzles: Update to latest version
> gnutls: Update to 2.12.11
> tzdata: Update to 2011k
> lsof: Update to 4.84
> apt: Update to 0.8.15.8
> distro_tracking: Updates
Merged to master apart from the apt change.
Thanks,
Richard
^ permalink raw reply
* Re: [PATCH 1/1] acl/attr: don't make symlink if base_libdir = libdir
From: Richard Purdie @ 2011-10-07 14:35 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <5930749806604b40d1dd6c36ec4b44c2507b4493.1317925433.git.sgw@linux.intel.com>
On Thu, 2011-10-06 at 11:25 -0700, Saul Wold wrote:
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/recipes-support/attr/ea-acl.inc | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
Merged to master, thanks.
Richard
^ permalink raw reply
* Re: WARNING: Deprecated components removal in 5 days
From: Richard Purdie @ 2011-10-07 14:17 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
In-Reply-To: <1317833828.6398.15.camel@ted>
On Wed, 2011-10-05 at 17:56 +0100, Richard Purdie wrote:
> I do plan to remove hal too as soon as the last dependency is removed
> (my build without hal isn't booting X correctly atm).
I've resolved those issues so I'm planning to also remove hal and
hal-info since neither component is used in OE-Core any longer.
Cheers,
Richard
^ permalink raw reply
* [PATCH] font-alias: Convert to use allarch including a patch to disable compiler checks
From: Richard Purdie @ 2011-10-07 14:15 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch b/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch
new file mode 100644
index 0000000..48e183c
--- a/dev/null
+++ b/meta/recipes-graphics/xorg-font/font-alias-1.0.3/nocompiler.patch
@@ -0,0 +1,30 @@
+XORG_DEFAULT_OPTIONS pulls in the following dependency chains:
+
+XORG_CWARNFLAGS -> AC_PROG_CC_C99
+XORG_STRICT_OPTION -> AC_PROG_CC_C99, XORG_CWARNFLAGS
+XORG_MANPAGE_SECTIONS -> AC_CANONICAL_HOST -> Checks host
+
+each of which triggers the use of the host compiler. As an "all"
+architecture package, it shouldn't need a compiler (and doesn't).
+
+RP 17/5/2011
+
+diff -uNr font-alias-1.0.3.orig//configure.ac font-alias-1.0.3/configure.ac
+--- font-alias-1.0.3.orig//configure.ac 2011-05-18 21:29:18.378258643 +0200
++++ font-alias-1.0.3/configure.ac 2011-05-18 21:32:06.865258593 +0200
+@@ -28,12 +28,12 @@
+ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ AM_MAINTAINER_MODE
+
+-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+ m4_ifndef([XORG_MACROS_VERSION],
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+ XORG_MACROS_VERSION(1.3)
+-XORG_DEFAULT_OPTIONS
+-
++XORG_RELEASE_VERSION
++XORG_CHANGELOG
++XORG_INSTALL
+ AC_PROG_INSTALL
+
+ XORG_FONTROOTDIR
diff --git a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb b/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb
index 1b63961..7005291 100644
--- a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb
+++ b/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb
@@ -9,14 +9,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bf0158b89be493d523d69d9f29265038 \
file://misc/fonts.alias;md5=a8ec05d528431d4c9703b55a7efd67a8 \
file://100dpi/fonts.alias;md5=85bebd6ca213aa656c301a72eb4397cb"
-DEPENDS = "virtual/xserver font-util"
+SRC_URI += "file://nocompiler.patch"
+
+DEPENDS = "util-macros-native"
RDEPENDS_${PN} = "encodings font-util"
RDEPENDS_${PN}_virtclass-native = "font-util-native"
-PE = "1"
-PR = "${INC_PR}.1"
+inherit allarch
-PACKAGE_ARCH = "all"
+PE = "1"
+PR = "${INC_PR}.2"
SRC_URI[md5sum] = "6d25f64796fef34b53b439c2e9efa562"
SRC_URI[sha256sum] = "8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a"
^ permalink raw reply related
* [PATCH] hicolor-icon-theme: Convert to allarch
From: Richard Purdie @ 2011-10-07 14:14 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb b/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
index c9d65a2..759c9d8 100644
--- a/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
+++ b/meta/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb
@@ -6,7 +6,9 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=f08a446809913fc9b3c718f0eaea0426"
SECTION = "unknown"
-inherit gnome
+inherit gnome allarch
+
+DEPENDS = ""
PR = "r0"
@@ -16,8 +18,6 @@ SRC_URI = "http://icon-theme.freedesktop.org/releases/${BPN}-${PV}.tar.gz \
SRC_URI[md5sum] = "55cafbcef8bcf7107f6d502149eb4d87"
SRC_URI[sha256sum] = "9edca690617eaa19054951ca53501c802180262be8880ed84754ac46c93bec73"
-PACKAGE_ARCH = "all"
-
FILES_${PN} += "${datadir}/icons"
do_install_append () {
^ permalink raw reply related
* Convoluted dependencies
From: Richard Purdie @ 2011-10-07 14:09 UTC (permalink / raw)
To: openembedded-core
I've been trying to figure out why our builds take as long as they do.
It appears our dependency chains are getting more and more convoluted
and this certainly isn't helping things. Specific pain points look like:
bison-native -> gettext-native
flex-native -> gettext-native
(which limits binutils-cross)
gettext-native -> libxml2-native -> python-native
(hence gettext takes a *long* time to be built)
What uses the python xml bindings?
pseudo-native -> sqlite3-native
(dragging out the time our effectively single threaded init takes)
I'm mentioning this in case anyone has good ideas for fixing some of
these...
Cheers,
Richard
^ permalink raw reply
* [PATCH] gcc/binutils: Disable NLS/gettext dependencies
From: Richard Purdie @ 2011-10-07 13:24 UTC (permalink / raw)
To: openembedded-core
We force the C locale when running builds for determinstic error messages. We
therefore have no need to NLS support in binutils cross or gcc cross.
We also don't need the standard base/autotools dependencies for our
toolchain components since we don't autoreconf these.
This patch turns off nls and cleans up some of the dependencies resulting
in a slightly less convoluted set of build dependencies.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
Note: This isn't the full potential gain of the NLS changes, the bigger
speedup comes from breaking the binutils dependency on flex/bison which
depend on gettext-native. This patch sets the scene though and is a
first step.
diff --git a/meta/recipes-devtools/binutils/binutils-cross.inc b/meta/recipes-devtools/binutils/binutils-cross.inc
index 5a41970..982224f 100644
--- a/meta/recipes-devtools/binutils/binutils-cross.inc
+++ b/meta/recipes-devtools/binutils/binutils-cross.inc
@@ -1,10 +1,14 @@
inherit cross
PROVIDES = "virtual/${TARGET_PREFIX}binutils"
+INHIBIT_DEFAULT_DEPS = "1"
+INHIBIT_AUTOTOOLS_DEPS = "1"
+
EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \
--program-prefix=${TARGET_PREFIX} \
--disable-install-libbfd \
--disable-werror \
+ --disable-nls \
--enable-poison-system-directories \
${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default', '', d)}"
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index a352e36..8ca3174 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -23,7 +23,7 @@ BRANCH = "gcc-4_6-branch"
FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.6' ], d)}"
DEPENDS =+ "mpfr gmp libmpc"
-NATIVEDEPS = "mpfr-native gmp-native gettext-native libmpc-native"
+NATIVEDEPS = "mpfr-native gmp-native libmpc-native"
LICENSE="GPL-3.0-with-GCC-exception & GPLv3"
@@ -108,3 +108,4 @@ EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap \
EXTRA_OECONF_append_linux-uclibc = " --disable-decimal-float "
EXTRA_OECONF_append_linux-uclibceabi = " --disable-decimal-float "
EXTRA_OECONF_append_linux-uclibcspe = " --disable-decimal-float "
+
diff --git a/meta/recipes-devtools/gcc/gcc-configure-cross.inc b/meta/recipes-devtools/gcc/gcc-configure-cross.inc
index 36edb81..d2d9081 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-cross.inc
@@ -4,8 +4,11 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
EXTRA_OECONF += " --enable-poison-system-directories \
--with-headers=${STAGING_DIR_TARGET}${SYSTEMHEADERS} \
+ --disable-nls \
"
+INHIBIT_DEFAULT_DEPS = "1"
+
EXTRA_OECONF_PATHS = "--with-local-prefix=${STAGING_DIR_TARGET}${target_exec_prefix} \
--with-gxx-include-dir=${target_includedir}/c++ \
--with-sysroot=${STAGING_DIR_TARGET} \
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index 4e2e343..d58bf70 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
@@ -1,7 +1,10 @@
-DEPENDS = "virtual/${TARGET_PREFIX}binutils gettext-native ${NATIVEDEPS}"
+DEPENDS = "virtual/${TARGET_PREFIX}binutils ${NATIVEDEPS}"
PROVIDES = "virtual/${TARGET_PREFIX}gcc-initial"
PACKAGES = ""
+INHIBIT_AUTOTOOLS_DEPS = "1"
+INHIBIT_DEFAULT_DEPS = "1"
+
CROSS_TARGET_SYS_DIR_append = ".${PN}"
# This is intended to be a -very- basic config
@@ -11,6 +14,7 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
--without-headers \
--disable-shared \
--disable-threads \
+ --disable-nls \
--disable-multilib \
--disable-__cxa_atexit \
--enable-languages=c \
diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
index 7b1bb38..f368ae9 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc
@@ -1,8 +1,11 @@
DEPENDS = "virtual/${TARGET_PREFIX}binutils ${NATIVEDEPS}"
-DEPENDS += "virtual/${TARGET_PREFIX}libc-initial gettext-native"
+DEPENDS += "virtual/${TARGET_PREFIX}libc-initial"
PROVIDES = "virtual/${TARGET_PREFIX}gcc-intermediate"
PACKAGES = ""
+INHIBIT_DEFAULT_DEPS = "1"
+INHIBIT_AUTOTOOLS_DEPS = "1"
+
CROSS_TARGET_SYS_DIR_append = ".${PN}"
# This is intended to be a -very- basic config
@@ -13,6 +16,7 @@ CROSS_TARGET_SYS_DIR_append = ".${PN}"
# preferred linker.
EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
--enable-shared \
+ --disable-nls \
--disable-multilib \
--disable-threads \
--enable-languages=c \
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox