[Consolidated Pull 0/9] Fixes for M1 and build breakage

[Consolidated Pull 0/9] Fixes for M1 and build breakage

[Saul Wold]

There a number of changes here for M1.

Nitin's change is included since it was queued already, bounce as needed


Sau!

The following changes since commit 9281ac4c98d4287a5492f13f94e1bd0eea4791c6:

  dbus 1.4.1: enable systemd support, but package systemd files seperately (2011-05-26 11:02:30 +0100)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib sgw/stage
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage

Darren Hart (1):
  utils.bbclass: make FILESEXTRAPATHS colon delimited

Koen Kooi (2):
  dbus: clean up dbus-x11 packaging
  x11-common: fix dbus-launch RDEPENDS

Martin Jansa (1):
  rm_work: keep all sigdata files in stamps dir

Nitin A Kamble (1):
  mesa-xlib: workaround gcc 4.6.0 ICE

Phil Blundell (1):
  busybox: sync do_install() with oe master (mostly)

Saul Wold (3):
  bitbake.conf: change IMAGE_ROOTFS_EXTRA_SPACE to soft (?=) default
  gnutls: Add libcap to DEPENDS
  Revert "createrepo: Update to 0.9.9"

 meta/classes/rm_work.bbclass                       |    4 +
 meta/classes/utils.bbclass                         |    6 +-
 meta/conf/bitbake.conf                             |   11 +-
 meta/recipes-core/busybox/busybox.inc              |   99 +++++++++++---------
 meta/recipes-core/busybox/busybox_1.18.4.bb        |    2 +-
 meta/recipes-core/dbus/dbus.inc                    |    2 +-
 meta/recipes-core/dbus/dbus_1.4.1.bb               |    2 +-
 meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb     |    6 +-
 meta/recipes-graphics/x11-common/x11-common_0.1.bb |    4 +-
 .../createrepo/createrepo/fix-native-install.patch |   88 ++++++++---------
 .../{createrepo_0.9.9.bb => createrepo_0.4.11.bb}  |    7 +-
 meta/recipes-support/gnutls/gnutls.inc             |    6 +-
 meta/recipes-support/gnutls/gnutls_2.10.4.bb       |    2 +-
 13 files changed, 129 insertions(+), 110 deletions(-)
 rename meta/recipes-support/createrepo/{createrepo_0.9.9.bb => createrepo_0.4.11.bb} (73%)

-- 
1.7.3.4

[Consolidated Pull 1/9] utils.bbclass: make FILESEXTRAPATHS colon delimited

[Saul Wold]

From: Darren Hart <dvhart@linux.intel.com>

Fixes [YOCTO 1102]

Path variables are typically : delimited. White space is allowed in paths, so
is not a good choice for separating paths. Currently utils.bbclass performs the
following:

    extrapaths = (bb.data.getVar("FILESEXTRAPATHS", d, True) or "").split()

This splits FILESEXTRAPATHS on whitespace. It later splits overrides on : and
reassembles them all together as : delimited.

There is only one user of FILESEXTRAPATHS in oe-core (qt4-tools-native, which
uses : anyway) and none in oe.

Change the split() in utils.bbclass to split on : instead of whitespace. When
splitting on a defined string (":") we must be careful to handle the empty
string case which returns [''] instead of [].

Tested building qt4-tools-native and core-image-minimal for surgarbay from
meta-intel with a couple extra layers with FILESEXTRAPATHS modifications added.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Phil Blundell <pb@pbcl.net>
---
 meta/classes/utils.bbclass |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass
index e103351..9930a24 100644
--- a/meta/classes/utils.bbclass
+++ b/meta/classes/utils.bbclass
@@ -331,8 +331,10 @@ def explode_deps(s):
 
 def base_set_filespath(path, d):
 	filespath = []
-	extrapaths = (bb.data.getVar("FILESEXTRAPATHS", d, True) or "").split()
-	path = extrapaths + path
+	extrapaths = (bb.data.getVar("FILESEXTRAPATHS", d, True) or "")
+	# Don't prepend empty strings to the path list
+	if extrapaths != "":
+		path = extrapaths.split(":") + path
 	# The ":" ensures we have an 'empty' override
 	overrides = (bb.data.getVar("OVERRIDES", d, 1) or "") + ":"
 	for p in path:
-- 
1.7.3.4

[Consolidated Pull 2/9] busybox: sync do_install() with oe master (mostly)

[Saul Wold]

From: Phil Blundell <pb@pbcl.net>

This is basically a backport of the current state of the art from the
openembedded master repo.  In particular this fixes an installation
error on micro:

| + cp -dPr /home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/image/bin /home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/image/sbin /home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/image /home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/image/busybox/
| cp: will not create hard link `/home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/image/busybox/image/bin' to directory `/home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/image/busybox/bin'
| cp: cannot copy a directory, `/home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/image', into itself, `/home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/image/busybox/image'
| ERROR: Function 'do_install' failed (see /home/pb/oe/build-meta/tmp-eglibc/work/i586-oe-linux/busybox-1.18.4-r1.2/temp/log.do_install.3808 for further information)

Signed-off-by: Phil Blundell <philb@gnu.org>
---
 meta/recipes-core/busybox/busybox.inc       |   99 +++++++++++++++------------
 meta/recipes-core/busybox/busybox_1.18.4.bb |    2 +-
 2 files changed, 55 insertions(+), 46 deletions(-)

diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index 341c5c4..86fbdae 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -46,75 +46,84 @@ do_compile() {
 }
 
 do_install () {
-	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+	oe_runmake busybox.links
+	if [ "${prefix}" != "/usr" ]; then
+		sed "s:^/usr/:${prefix}/:" busybox.links > busybox.links.new
+		mv busybox.links.new busybox.links
+	fi
+	if [ "${base_sbindir}" != "/sbin" ]; then
+		sed "s:^/sbin/:${base_sbindir}/:" busybox.links > busybox.links.new
+		mv busybox.links.new busybox.links
+	fi
+
 	install -d ${D}${sysconfdir}/init.d
-	oe_runmake "PREFIX=${D}" install
-	cp -pPR ${S}/_install/* ${D}/
-
-	# Move everything to /busybox (not supposed to end up in any package)
-	install -d ${D}/busybox
-	ls ${D} -R
-
-	cp -dPr ${D}${base_bindir} ${D}${base_sbindir} ${D}${prefix} ${D}/busybox/
-	# Move the busybox binary back to /bin
-	install -d ${D}${base_bindir}
-	mv ${D}/busybox${base_bindir}/busybox ${D}${base_bindir}/
-	# Move back the sh symlink
-	test -h ${D}/busybox${base_bindir}/sh && mv ${D}/busybox${base_bindir}/sh ${D}${base_bindir}/
-
-	install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${PN}
-	install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf.${PN}
-	if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
-		# Move crond back to /usr/sbin/crond
-		install -d ${D}${sbindir}
-		mv ${D}/busybox${sbindir}/crond ${D}${sbindir}/
 
+	if ! grep -q "CONFIG_FEATURE_INDIVIDUAL=y" ${WORKDIR}/defconfig; then
+		# Install /bin/busybox, and the /bin/sh link so the postinst script
+		# can run. Let update-alternatives handle the rest.
+		install -d ${D}${base_bindir}
+		if grep -q "CONFIG_FEATURE_SUID=y" ${WORKDIR}/defconfig; then
+			install -m 4755 ${S}/busybox ${D}${base_bindir}
+		else
+			install -m 0755 ${S}/busybox ${D}${base_bindir}
+		fi
+		ln -sf busybox ${D}${base_bindir}/sh
+	else
+		install -d ${D}${base_bindir} ${D}${base_sbindir}
+		install -d ${D}${libdir} ${D}${bindir} ${D}${sbindir}
+		cat busybox.links | while read FILE; do
+			NAME=`basename "$FILE"`
+			install -m 0755 "0_lib/$NAME" "${D}$FILE.${PN}"
+		done
+		# add suid bit where needed
+		for i in `grep -E "APPLET.*_BB_SUID_((MAYBE|REQUIRE))" include/applets.h | grep -v _BB_SUID_DROP | cut -f 3 -d '(' | cut -f 1 -d ','`; do
+			find ${D} -name $i.${PN} -exec chmod a+s {} \;
+		done
+		install -m 0755 0_lib/libbusybox.so.${PV} ${D}${libdir}/libbusybox.so.${PV}
+		ln -sf sh.${PN} ${D}${base_bindir}/sh
+		ln -sf ln.${PN} ${D}${base_bindir}/ln
+		ln -sf test.${PN} ${D}${bindir}/test
+		if [ -f ${D}/linuxrc.${PN} ]; then
+			mv ${D}/linuxrc.${PN} ${D}/linuxrc
+		fi
+	fi
+
+	if grep -q "CONFIG_SYSLOGD=y" ${WORKDIR}/defconfig; then
+		install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${PN}
+		install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf.${PN}
+	fi
+	if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
 		install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
 	fi
 	if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then
-		# Move httpd back to /usr/sbin/httpd
-		install -d ${D}${sbindir}
-		mv ${D}/busybox${sbindir}/httpd ${D}${sbindir}/
-
 		install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/
 		install -d ${D}/srv/www
 	fi
 	if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then
-		# Move udhcpd back to /usr/sbin/udhcpd
-		install -d ${D}${sbindir}
-		mv ${D}/busybox${sbindir}/udhcpd ${D}${sbindir}/
-
 		install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/
 	fi
 	if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then
-		# Move hwclock back to /sbin/hwclock
-		install -d ${D}${base_sbindir}
-		mv ${D}/busybox${base_sbindir}/hwclock ${D}${base_sbindir}/
-
+		install -d ${D}${sysconfdir}/default
 		install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/
 	fi
 	if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then
-		# Move dhcpc back to /usr/sbin/udhcpc
-		install -d ${D}${base_sbindir}
-		mv ${D}/busybox${base_sbindir}/udhcpc ${D}${base_sbindir}/
-
 		install -d ${D}${sysconfdir}/udhcpc.d
 		install -d ${D}${datadir}/udhcpc
-		install -m 0755 ${S}/examples/udhcp/simple.script ${D}${sysconfdir}/udhcpc.d/50default
+                install -m 0755 ${WORKDIR}/simple.script ${D}${sysconfdir}/udhcpc.d/50default
 		install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script
 		install -m 0755 ${WORKDIR}/busybox-udhcpc ${D}${sysconfdir}/init.d/
 	fi
-	if grep "CONFIG_MDEV=y" ${WORKDIR}/defconfig; then
-		install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/mdev
-		if grep "CONFIG_FEATURE_MDEV_CONF=y" ${WORKDIR}/defconfig; then
-			install -m 644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/mdev.conf
-		fi
+	if grep "CONFIG_INETD=y" ${WORKDIR}/defconfig; then
+		install -m 0755 ${WORKDIR}/inetd ${D}${sysconfdir}/init.d/inetd.${PN}
+		install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/
+	fi
+        if grep "CONFIG_MDEV=y" ${WORKDIR}/defconfig; then
+               install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/mdev
+               if grep "CONFIG_FEATURE_MDEV_CONF=y" ${WORKDIR}/defconfig; then
+                       install -m 644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/mdev.conf
+               fi
 	fi
-
 	install -m 0644 ${S}/busybox.links ${D}${sysconfdir}
-
-	# remove the temp dir to suppress warning, we are done with it
-	rm -rf ${D}/busybox
 }
 
 pkg_postinst_${PN} () {
diff --git a/meta/recipes-core/busybox/busybox_1.18.4.bb b/meta/recipes-core/busybox/busybox_1.18.4.bb
index cf37650..a5080d5 100644
--- a/meta/recipes-core/busybox/busybox_1.18.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.18.4.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
            file://udhcpscript.patch \
-- 
1.7.3.4

[Consolidated Pull 3/9] bitbake.conf: change IMAGE_ROOTFS_EXTRA_SPACE to soft (?=) default

[Saul Wold]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/conf/bitbake.conf |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 35fd6f8..d307385 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -347,13 +347,14 @@ IMAGE_BASENAME = "${PN}"
 IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}"
 IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}"
 
-# This option allows for a precentage overage of the actaul image size rather than a
-# fixed extra space
+# This option allows for a percentage overage of the actual image size rather than a
+# fixed extra space, this is space needed for initial startup and basic operations.
 IMAGE_OVERHEAD_FACTOR ?= 1.3
 # This option allow for adding addition space in K above and beyond what the 
-# IMAGE_OVERHEAD_FACTOR might add. To set a fixed size then overrideing IMAGE_ROOTFS_SIZE
-# with the max size one wants should do the trick
-IMAGE_ROOTFS_EXTRA_SPACE = "0"
+# IMAGE_OVERHEAD_FACTOR might add. This space is for additional packages, user data, ...
+# To set a fixed size then overrideing IMAGE_ROOTFS_SIZE with the max size one wants
+# should do the trick
+IMAGE_ROOTFS_EXTRA_SPACE ?= "0"
 
 EXTRA_IMAGEDEPENDS = ""
 
-- 
1.7.3.4

[Consolidated Pull 4/9] gnutls: Add libcap to DEPENDS

[Saul Wold]

Setup INC_PR for PR bumps

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-support/gnutls/gnutls.inc       |    6 ++++--
 meta/recipes-support/gnutls/gnutls_2.10.4.bb |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc
index 2dcd8a0..fd77af4 100644
--- a/meta/recipes-support/gnutls/gnutls.inc
+++ b/meta/recipes-support/gnutls/gnutls.inc
@@ -1,9 +1,9 @@
 DESCRIPTION = "GNU Transport Layer Security Library"
 HOMEPAGE = "http://www.gnu.org/software/gnutls/"
 BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls"
-DEPENDS = "zlib lzo libtasn1 libgcrypt (>= 1.4.2)"
+DEPENDS = "zlib lzo libtasn1 libgcrypt (>= 1.4.2) libcap"
 
-BBCLASSEXTEND = "native"
+INC_PR = "r1"
 
 LICENSE = "GPLv3+ & LGPLv2.1+"
 LICENSE_${PN} = "LGPLv2.1+"
@@ -44,3 +44,5 @@ FILES_${PN}-dev += "${bindir}/*-config ${bindir}/gnutls-cli-debug"
 FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*"
 FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*"
 FILES_${PN}-xx = "${libdir}/libgnutlsxx.so.*"
+
+BBCLASSEXTEND = "native"
diff --git a/meta/recipes-support/gnutls/gnutls_2.10.4.bb b/meta/recipes-support/gnutls/gnutls_2.10.4.bb
index 3924ecd..cc2fa27 100644
--- a/meta/recipes-support/gnutls/gnutls_2.10.4.bb
+++ b/meta/recipes-support/gnutls/gnutls_2.10.4.bb
@@ -1,6 +1,6 @@
 require gnutls.inc
 
-PR = "r0"
+PR = "${INC_PR}.0"
 
 SRC_URI += "file://gnutls-openssl.patch \
             file://gnutls-texinfo-euro.patch \
-- 
1.7.3.4

[Consolidated Pull 5/9] Revert "createrepo: Update to 0.9.9"

[Saul Wold]

This was just the wrong update to go to, it was not fully vetted
and contains yum requirements which is not a direction we are moving
in.

This reverts commit 7576eba58cdfebf0606623c25ae969ef52774099.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../createrepo/createrepo/fix-native-install.patch |   88 +++++++++----------
 .../{createrepo_0.9.9.bb => createrepo_0.4.11.bb}  |    7 +-
 2 files changed, 46 insertions(+), 49 deletions(-)
 rename meta/recipes-support/createrepo/{createrepo_0.9.9.bb => createrepo_0.4.11.bb} (73%)

diff --git a/meta/recipes-support/createrepo/createrepo/fix-native-install.patch b/meta/recipes-support/createrepo/createrepo/fix-native-install.patch
index ece205b..d8202a4 100644
--- a/meta/recipes-support/createrepo/createrepo/fix-native-install.patch
+++ b/meta/recipes-support/createrepo/createrepo/fix-native-install.patch
@@ -6,24 +6,19 @@ There are two fixes:
   1. -native needs to customize prefix
   2. needs to change python reference in binaries
 
-Upstream-Status: Inappropriate [native]
-
 Signed-off-by: Qing He <qing.he@intel.com>
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
 
-Index: createrepo-0.9.9/Makefile
-===================================================================
---- createrepo-0.9.9.orig/Makefile	2011-01-26 09:14:30.000000000 -0800
-+++ createrepo-0.9.9/Makefile	2011-04-06 14:12:06.608923997 -0700
-@@ -10,22 +10,22 @@
+diff --git a/Makefile b/Makefile
+index b2d1a32..3c3639f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,22 +3,22 @@ VERSION = 0.4.11
  SHELL = /bin/sh
  top_srcdir = .
  srcdir = .
 -prefix = /usr
 -exec_prefix = ${prefix}
-+prefix ?= /usr
-+exec_prefix ?= ${prefix}
- 
+-
 -bindir = ${exec_prefix}/bin
 -sbindir = ${exec_prefix}/sbin
 -libexecdir = ${exec_prefix}/libexec
@@ -33,6 +28,9 @@ Index: createrepo-0.9.9/Makefile
 -localstatedir = ${prefix}/var
 -libdir = ${exec_prefix}/lib
 -infodir = ${prefix}/info
++prefix ?= /usr
++exec_prefix ?= ${prefix}
++
 +bindir ?= ${exec_prefix}/bin
 +sbindir ?= ${exec_prefix}/sbin
 +libexecdir ?= ${exec_prefix}/libexec
@@ -49,21 +47,19 @@ Index: createrepo-0.9.9/Makefile
 -mandir = ${prefix}/share/man
 +mandir ?= ${prefix}/share/man
  
- pkgdatadir = $(datadir)/$(PKGNAME)
- pkglibdir = $(libdir)/$(PKGNAME)
-Index: createrepo-0.9.9/bin/Makefile
-===================================================================
---- createrepo-0.9.9.orig/bin/Makefile	2011-01-26 09:14:30.000000000 -0800
-+++ createrepo-0.9.9/bin/Makefile	2011-04-06 14:15:07.212923998 -0700
+ pkgdatadir = $(datadir)/$(PACKAGE)
+ pkglibdir = $(libdir)/$(PACKAGE)
+diff --git a/bin/Makefile b/bin/Makefile
+index 52c1f50..e30610e 100644
+--- a/bin/Makefile
++++ b/bin/Makefile
 @@ -1,22 +1,22 @@
  SHELL = /bin/sh
  top_srcdir = ..
  srcdir = ../bin
 -prefix = /usr
 -exec_prefix = ${prefix}
-+prefix ?= /usr
-+exec_prefix ?= ${prefix}
- 
+-
 -bindir = ${exec_prefix}/bin
 -sbindir = ${exec_prefix}/sbin
 -libexecdir = ${exec_prefix}/libexec
@@ -73,6 +69,9 @@ Index: createrepo-0.9.9/bin/Makefile
 -localstatedir = ${prefix}/var
 -libdir = ${exec_prefix}/lib
 -infodir = ${prefix}/info
++prefix ?= /usr
++exec_prefix ?= ${prefix}
++
 +bindir ?= ${exec_prefix}/bin
 +sbindir ?= ${exec_prefix}/sbin
 +libexecdir ?= ${exec_prefix}/libexec
@@ -89,55 +88,49 @@ Index: createrepo-0.9.9/bin/Makefile
 -mandir = ${prefix}/man
 +mandir ?= ${prefix}/man
  
- pkgdatadir = $(datadir)/$(PKGNAME)
- pkglibdir = $(libdir)/$(PKGNAME)
-@@ -41,9 +41,14 @@
+ pkgdatadir = $(datadir)/$(PACKAGE)
+ pkglibdir = $(libdir)/$(PACKAGE)
+@@ -40,8 +40,11 @@ all: $(srcdir)/$(PACKAGE)
  
  
  install: all installdirs
--	$(INSTALL_BIN) $(srcdir)/$(PKGNAME) $(DESTDIR)$(bindir)/$(PKGNAME)
+-	$(INSTALL_BIN) $(srcdir)/$(PACKAGE) $(DESTDIR)$(bindir)/$(PACKAGE)
 -	$(INSTALL_BIN) $(srcdir)/modifyrepo $(DESTDIR)$(bindir)/modifyrepo
--	$(INSTALL_BIN) $(srcdir)/mergerepo $(DESTDIR)$(bindir)/mergerepo
 +	sed -e "s|@DATADIR@|$(datadir)|" $(srcdir)/$(PACKAGE) > $(srcdir)/$(PACKAGE).tmp
 +	sed -e "s|@DATADIR@|$(datadir)|" $(srcdir)/modifyrepo > $(srcdir)/modifyrepo.tmp
-+	sed -e "s|@DATADIR@|$(datadir)|" $(srcdir)/mergerepo > $(srcdir)/mergerepo.tmp
 +	$(INSTALL_BIN) $(srcdir)/$(PACKAGE).tmp $(DESTDIR)$(bindir)/$(PACKAGE)
 +	$(INSTALL_BIN) $(srcdir)/modifyrepo.tmp $(DESTDIR)$(bindir)/modifyrepo
-+	$(INSTALL_BIN) $(srcdir)/mergerepo.tmp $(DESTDIR)$(bindir)/mergerepo
-+	rm -f $(srcdir)/$(PACKAGE).tmp $(srcdir)/modifyrepo.tmp $(srcdir)/mergerepo.tmp
-+
++	rm -f $(srcdir)/$(PACKAGE).tmp $(srcdir)/modifyrepo.tmp
  
  
  uninstall:
-Index: createrepo-0.9.9/bin/createrepo
-===================================================================
---- createrepo-0.9.9.orig/bin/createrepo	2011-01-26 09:14:30.000000000 -0800
-+++ createrepo-0.9.9/bin/createrepo	2011-04-06 14:12:06.608923997 -0700
+diff --git a/bin/createrepo b/bin/createrepo
+index b0de515..eaacb39 100755
+--- a/bin/createrepo
++++ b/bin/createrepo
 @@ -1,2 +1,2 @@
  #!/bin/sh
 -exec /usr/share/createrepo/genpkgmetadata.py "$@"
 +exec @DATADIR@/createrepo/genpkgmetadata.py "$@"
-Index: createrepo-0.9.9/bin/modifyrepo
-===================================================================
---- createrepo-0.9.9.orig/bin/modifyrepo	2011-01-26 09:14:30.000000000 -0800
-+++ createrepo-0.9.9/bin/modifyrepo	2011-04-06 14:12:06.608923997 -0700
+diff --git a/bin/modifyrepo b/bin/modifyrepo
+index c9732d8..6f7c1d4 100755
+--- a/bin/modifyrepo
++++ b/bin/modifyrepo
 @@ -1,2 +1,2 @@
  #!/bin/sh
 -exec /usr/share/createrepo/modifyrepo.py "$@"
 +exec @DATADIR@/createrepo/modifyrepo.py "$@"
-Index: createrepo-0.9.9/docs/Makefile
-===================================================================
---- createrepo-0.9.9.orig/docs/Makefile	2011-01-26 09:14:30.000000000 -0800
-+++ createrepo-0.9.9/docs/Makefile	2011-04-06 14:12:06.608923997 -0700
+diff --git a/docs/Makefile b/docs/Makefile
+index 0a41179..e128c85 100644
+--- a/docs/Makefile
++++ b/docs/Makefile
 @@ -1,22 +1,22 @@
  SHELL = /bin/sh
  top_srcdir = ..
  srcdir = ../docs
 -prefix = /usr
 -exec_prefix = ${prefix}
-+prefix ?= /usr
-+exec_prefix ?= ${prefix}
- 
+-
 -bindir = ${exec_prefix}/bin
 -sbindir = ${exec_prefix}/sbin
 -libexecdir = ${exec_prefix}/libexec
@@ -147,6 +140,9 @@ Index: createrepo-0.9.9/docs/Makefile
 -localstatedir = ${prefix}/var
 -libdir = ${exec_prefix}/lib
 -infodir = ${prefix}/info
++prefix ?= /usr
++exec_prefix ?= ${prefix}
++
 +bindir ?= ${exec_prefix}/bin
 +sbindir ?= ${exec_prefix}/sbin
 +libexecdir ?= ${exec_prefix}/libexec
@@ -163,5 +159,5 @@ Index: createrepo-0.9.9/docs/Makefile
 -mandir = ${datadir}/man
 +mandir ?= ${datadir}/man
  
- pkgdatadir = $(datadir)/$(PKGNAME)
- pkglibdir = $(libdir)/$(PKGNAME)
+ pkgdatadir = $(datadir)/$(PACKAGE)
+ pkglibdir = $(libdir)/$(PACKAGE)
diff --git a/meta/recipes-support/createrepo/createrepo_0.9.9.bb b/meta/recipes-support/createrepo/createrepo_0.4.11.bb
similarity index 73%
rename from meta/recipes-support/createrepo/createrepo_0.9.9.bb
rename to meta/recipes-support/createrepo/createrepo_0.4.11.bb
index 89f18f4..ba1d04b 100644
--- a/meta/recipes-support/createrepo/createrepo_0.9.9.bb
+++ b/meta/recipes-support/createrepo/createrepo_0.4.11.bb
@@ -4,13 +4,14 @@ HOMEPAGE = "http://createrepo.baseurl.org/"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI= "http://createrepo.baseurl.org/download/${BP}.tar.gz \
           file://fix-native-install.patch \
          "
-SRC_URI[md5sum] = "10641f19a40e9f633b300e23dde00349"
-SRC_URI[sha256sum] = "ee897463837b299fb20bf6e970f8c5324cd8b7f26ad3675a9938a2d7ae42ff03"
+
+SRC_URI[md5sum] = "3e9ccf4abcffe3f49af078c83611eda2"
+SRC_URI[sha256sum] = "a73ae11a0dcde8bde36d900bc3f7f8f1083ba752c70a5c61b72d1e1e7608f21b"
 
 BBCLASSEXTEND = "native"
 
-- 
1.7.3.4

[Consolidated Pull 6/9] dbus: clean up dbus-x11 packaging

[Saul Wold]

From: Koen Kooi <koen@dominion.thruhere.net>

Martin Jansa spotted some differences with OE dev, which this commit fixes:

 * dbus-launch is mentioned twice in FILES
 * dbus-x11 should drag in dbus-1

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-core/dbus/dbus.inc      |    2 +-
 meta/recipes-core/dbus/dbus_1.4.1.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 8275a1b..2a5f8bd 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -24,12 +24,12 @@ DEBIANNAME_${PN} = "dbus-1"
 PACKAGES =+ "${PN}-lib ${PN}-x11 ${PN}-systemd"
 
 FILES_${PN}-x11 = "${bindir}/dbus-launch"
+RDEPENDS_${PN}-x11 = "${PN}"
 
 FILES_${PN}-systemd = "${base_libdir}/systemd/system/"
 
 FILES_${PN} = "${bindir}/dbus-daemon* \
                ${bindir}/dbus-uuidgen \
-               ${bindir}/dbus-launch \
                ${bindir}/dbus-cleanup-sockets \
                ${bindir}/dbus-send \
                ${bindir}/dbus-monitor \
diff --git a/meta/recipes-core/dbus/dbus_1.4.1.bb b/meta/recipes-core/dbus/dbus_1.4.1.bb
index 00720fd..1c8aeaa 100644
--- a/meta/recipes-core/dbus/dbus_1.4.1.bb
+++ b/meta/recipes-core/dbus/dbus_1.4.1.bb
@@ -1,6 +1,6 @@
 include dbus.inc
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI[md5sum] = "99cb057700c0455fb68f8d57902f77ac"
 SRC_URI[sha256sum] = "caa1a0ded2d0f2e95c1d4ec7e3c8bd44834928c5b0ed41a7189963f3593983bd"
-- 
1.7.3.4

[Consolidated Pull 7/9] x11-common: fix dbus-launch RDEPENDS

[Saul Wold]

From: Koen Kooi <koen@dominion.thruhere.net>

/usr/bin/dbus-launch is in the dbus-x11 packages, the dbus-launch package doesn't exist

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/recipes-graphics/x11-common/x11-common_0.1.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/x11-common/x11-common_0.1.bb b/meta/recipes-graphics/x11-common/x11-common_0.1.bb
index 10757ac..6951cf3 100644
--- a/meta/recipes-graphics/x11-common/x11-common_0.1.bb
+++ b/meta/recipes-graphics/x11-common/x11-common_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and configuration files"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 SECTION = "x11"
-PR = "r41"
+PR = "r43"
 
 SRC_URI = "file://etc \
            file://gplv2-license.patch"
@@ -16,6 +16,6 @@ do_install() {
 	find ${D}/etc -type f -name \*~ -exec rm -rf {} \;
 }
 
-RDEPENDS_${PN} = "dbus-launch xmodmap xdpyinfo xtscal xinit formfactor"
+RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xtscal xinit formfactor"
 PACKAGE_ARCH = "all"
 
-- 
1.7.3.4

[Consolidated Pull 8/9] rm_work: keep all sigdata files in stamps dir

[Saul Wold]

From: Martin Jansa <martin.jansa@gmail.com>

* this makes fix for [YOCTO #1074] in bitbake 139b8a625818225c358a1b8363518d7ed6913188
  much more usefull for people using rm_work

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/classes/rm_work.bbclass |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/meta/classes/rm_work.bbclass b/meta/classes/rm_work.bbclass
index 256a202..303d47d 100644
--- a/meta/classes/rm_work.bbclass
+++ b/meta/classes/rm_work.bbclass
@@ -42,6 +42,10 @@ do_rm_work () {
             *do_setscene*)
                 break
                 ;;
+            *sigdata*)
+                i=dummy
+                break
+                ;;
             *do_package_write*)
                 i=dummy
                 break
-- 
1.7.3.4

[Consolidated Pull 9/9] mesa-xlib: workaround gcc 4.6.0 ICE

[Saul Wold]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

Fixes this bug [YOCTO #1105]

Working around this issue withg gcc 4.6.0 for beagleboard machine (armv7)

ccache arm-poky-linux-gnueabi-gcc -march=armv7-a -mtune=cortex-a8 -mfpu=neon
-mfloat-abi=softfp -fno-tree-vectorize
--sysroot=/build_disk/poky_build/build0/tmp/sysroots/beagleboard -c -I.
-I../../../../src/gallium/include -I../../../../src/gallium/auxiliary
-I../../../../src/gallium/drivers
-I../../../../src/gallium/drivers/svga/include -O2 -pipe -g
-feliminate-unused-debug-types -Wall -Wmissing-prototypes -std=c99 -ffast-math
-fvisibility=hidden -fno-strict-aliasing -fPIC -D_GNU_SOURCE -DPTHREADS
-DHAVE_POSIX_MEMALIGN -DUSE_XSHM -std=gnu99 -fvisibility=hidden -DHAVE_STDINT_H
-DHAVE_SYS_TYPES_H svga_tgsi_insn.c -o svga_tgsi_insn.o
svga_tgsi_insn.c: In function 'svga_shader_emit_instructions':
svga_tgsi_insn.c:2969:1: internal compiler error: in push_minipool_fix, at
config/arm/arm.c:12084
Please submit a full bug report,
with preprocessed source if appropriate.
See <http://gcc.gnu.org/bugs.html> for instructions.
make[4]: *** [svga_tgsi_insn.o] Error 1

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
index b77df2c..d9c3806 100644
--- a/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
+++ b/meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb
@@ -14,6 +14,10 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-nativ
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} makedepend-native"
 
 PE = "1"
-PR = "r0"
+PR = "r1"
 
 EXTRA_OECONF += "--with-driver=xlib"
+
+# GCC 4.6.0 hits an internal compiler error using -O2 on beagleboard machine
+# use -O to nullify -O2 as a workaround.
+CFLAGS_append += " -O"
-- 
1.7.3.4

Re: [Consolidated Pull 0/9] Fixes for M1 and build breakage

[Richard Purdie]

On Thu, 2011-05-26 at 16:07 -0700, Saul Wold wrote:
> Darren Hart (1):
>   utils.bbclass: make FILESEXTRAPATHS colon delimited

Feedback to patch sent, can be simplified (I think).

> Koen Kooi (2):
>   dbus: clean up dbus-x11 packaging
>   x11-common: fix dbus-launch RDEPENDS

Merged

> Martin Jansa (1):
>   rm_work: keep all sigdata files in stamps dir

Merged

> Nitin A Kamble (1):
>   mesa-xlib: workaround gcc 4.6.0 ICE

Merged an update version Nitin provided

> Phil Blundell (1):
>   busybox: sync do_install() with oe master (mostly)

I want to check something with this one first so held back for now as
its late and I'd like to sleep :)

> Saul Wold (3):
>   bitbake.conf: change IMAGE_ROOTFS_EXTRA_SPACE to soft (?=) default
>   gnutls: Add libcap to DEPENDS
>   Revert "createrepo: Update to 0.9.9"

Merged.

Cheers,

Richard