diff options
author | Saul Wold <sgw@linux.intel.com> | 2013-09-11 14:38:01 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-11 23:31:00 +0100 |
commit | 8f9db772dc8d8e2448a2d91f3be3aceb8829db75 (patch) | |
tree | 32361002daf766b6a4381515223a9e12506a1356 | |
parent | 33e8896a46ac75ad84ede22334c04e06e4d675a5 (diff) | |
download | poky-8f9db772dc8d8e2448a2d91f3be3aceb8829db75.tar.gz |
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]
(From OE-Core rev: 3653500c7e5d365ddc2868d985c6001d40123672)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/bluez/bluez4.inc | 1 | ||||
-rw-r--r-- | 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 b540622cb1..e4f6834d42 100644 --- a/meta/recipes-connectivity/bluez/bluez4.inc +++ b/meta/recipes-connectivity/bluez/bluez4.inc | |||
@@ -43,3 +43,4 @@ EXTRA_OECONF = "\ | |||
43 | --with-udevrulesdir=`pkg-config --variable=udevdir udev`/rules.d \ | 43 | --with-udevrulesdir=`pkg-config --variable=udevdir udev`/rules.d \ |
44 | " | 44 | " |
45 | 45 | ||
46 | 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 += "\ | |||
82 | RDEPENDS_${PN}-testtools += "python python-dbus python-pygobject" | 82 | RDEPENDS_${PN}-testtools += "python python-dbus python-pygobject" |
83 | 83 | ||
84 | SYSTEMD_SERVICE_${PN} = "bluetooth.service" | 84 | SYSTEMD_SERVICE_${PN} = "bluetooth.service" |
85 | |||
86 | EXCLUDE_FROM_WORLD = "1" | ||