summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2013-09-11 14:38:01 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-11 23:23:31 +0100
commit3653500c7e5d365ddc2868d985c6001d40123672 (patch)
tree31b4942edbc186156546962a20e06297bb892eda /meta/recipes-connectivity
parent975412f446066215a94be78a7f7e1db9e28ebbbf (diff)
downloadopenembedded-core-3653500c7e5d365ddc2868d985c6001d40123672.tar.gz
openembedded-core-3653500c7e5d365ddc2868d985c6001d40123672.tar.bz2
openembedded-core-3653500c7e5d365ddc2868d985c6001d40123672.zip
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@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/bluez/bluez4.inc1
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5.inc2
2 files changed, 3 insertions, 0 deletions
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"