summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/bluez5/bluez5.inc
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-04-22 16:16:06 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-29 07:58:45 +0100
commit05797191f04222df69e90711f0ea6a78648dc323 (patch)
tree7e4260385abcff039f2a15ee85ae7c5bf6e7780f /meta/recipes-connectivity/bluez5/bluez5.inc
parent860dfafeed8bc387defba9ec7fa0622b3a82ec31 (diff)
downloadpoky-05797191f04222df69e90711f0ea6a78648dc323.tar.gz
bluez5: enable out-of-tree builds
A patch is needed to fix a race in out-of-tree builds, and the install-ptest logic can be simplified. (From OE-Core rev: 471fdafb340e90a4ab2e31854f69d5204e9380bf) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/bluez5/bluez5.inc')
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index a508229a34..9063629b9b 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -18,6 +18,7 @@ PACKAGECONFIG[experimental] = "--enable-experimental,--disable-experimental,"
18 18
19SRC_URI = "\ 19SRC_URI = "\
20 ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ 20 ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
21 file://out-of-tree.patch \
21 file://init \ 22 file://init \
22 file://run-ptest \ 23 file://run-ptest \
23 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \ 24 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \
@@ -25,7 +26,7 @@ SRC_URI = "\
25" 26"
26S = "${WORKDIR}/bluez-${PV}" 27S = "${WORKDIR}/bluez-${PV}"
27 28
28inherit autotools-brokensep pkgconfig systemd update-rc.d distro_features_check ptest 29inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest
29 30
30EXTRA_OECONF = "\ 31EXTRA_OECONF = "\
31 --enable-tools \ 32 --enable-tools \
@@ -108,5 +109,5 @@ do_compile_ptest() {
108 109
109do_install_ptest() { 110do_install_ptest() {
110 cp -r ${B}/unit/ ${D}${PTEST_PATH} 111 cp -r ${B}/unit/ ${D}${PTEST_PATH}
111 rm ${D}${PTEST_PATH}/unit/*.c ${D}${PTEST_PATH}/unit/*.o 112 rm -f ${D}${PTEST_PATH}/unit/*.o
112} 113}