[oe-commits] Saul Wold : bluez4/5: Add EXCLUDE_FROM_WORLD = 1
git at git.openembedded.org
git at git.openembedded.org
Wed Sep 11 22:19:15 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: 3653500c7e5d365ddc2868d985c6001d40123672
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3653500c7e5d365ddc2868d985c6001d40123672
Author: Saul Wold <sgw at linux.intel.com>
Date: Wed Sep 11 14:38:01 2013 -0700
bluez4/5: Add EXCLUDE_FROM_WORLD = 1
We can't build both recipes in the world build as there is a collision of package name
and PR values. Specificly the libasound-module-bluez which is the same in both goes
backwards from r5 (bluez4) -> r0 (bluez5) and the subpackage_metadata check fails:
ERROR: Recipe lib32-bluez5 is trying to change PR from 'r0' to 'r5'. This will cause do_package_write_* failures since the incorrect data will be used and they will be unable to find the right workdir.
[YOCTO #5165]
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-connectivity/bluez/bluez4.inc | 1 +
meta/recipes-connectivity/bluez5/bluez5.inc | 2 ++
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc
index b540622..e4f6834 100644
--- a/meta/recipes-connectivity/bluez/bluez4.inc
+++ b/meta/recipes-connectivity/bluez/bluez4.inc
@@ -43,3 +43,4 @@ EXTRA_OECONF = "\
--with-udevrulesdir=`pkg-config --variable=udevdir udev`/rules.d \
"
+EXCLUDE_FROM_WORLD = "1"
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index e5cb9e8..2e25d86 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -82,3 +82,5 @@ FILES_${PN}-dbg += "\
RDEPENDS_${PN}-testtools += "python python-dbus python-pygobject"
SYSTEMD_SERVICE_${PN} = "bluetooth.service"
+
+EXCLUDE_FROM_WORLD = "1"
More information about the Openembedded-commits
mailing list