From 3653500c7e5d365ddc2868d985c6001d40123672 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Wed, 11 Sep 2013 14:38:01 -0700 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-connectivity/bluez/bluez4.inc | 1 + meta/recipes-connectivity/bluez5/bluez5.inc | 2 ++ 2 files changed, 3 insertions(+) diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc index b540622cb1..e4f6834d42 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 e5cb9e8ba7..2e25d86e55 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" -- cgit v1.2.3