mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

bluez5: enable out-of-tree builds

Browse Source 
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)

(From OE-Core rev: 75fad33f495ca8a548b98054e4731940d1491d94)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2016-04-22 16:16:06 +01:00
committed by Richard Purdie
parent 2aae36ea43
commit 0df81c8485
2 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-connectivity/bluez5/bluez5.inc
+3 -2
View File
@@ -18,6 +18,7 @@ PACKAGECONFIG[experimental] = "--enable-experimental,--disable-experimental,"
SRC_URI = "\ SRC_URI = "\
${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \
file://out-of-tree.patch \
file://init \ file://init \
file://run-ptest \ file://run-ptest \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \ ${@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 = "\
" "
S = "${WORKDIR}/bluez-${PV}" S = "${WORKDIR}/bluez-${PV}"
inherit autotools-brokensep pkgconfig systemd update-rc.d distro_features_check ptest inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest
EXTRA_OECONF = "\ EXTRA_OECONF = "\
--enable-tools \ --enable-tools \
@@ -112,5 +113,5 @@ do_compile_ptest() {
do_install_ptest() { do_install_ptest() {
cp -r ${B}/unit/ ${D}${PTEST_PATH} cp -r ${B}/unit/ ${D}${PTEST_PATH}
rm ${D}${PTEST_PATH}/unit/*.c ${D}${PTEST_PATH}/unit/*.o rm -f ${D}${PTEST_PATH}/unit/*.o
} }
meta/recipes-connectivity/bluez5/bluez5/out-of-tree.patch
+26
View File
@@ -0,0 +1,26 @@
From ed55b49a226ca3909f52416be2ae5ce1c5ca2cb2 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Fri, 22 Apr 2016 15:40:37 +0100
Subject: [PATCH] Makefile.obexd: add missing mkdir in builtin.h generation
In parallel out-of-tree builds it's possible that obexd/src/builtin.h is
generated before the target directory has been implicitly created. Solve this by
creating the directory before writing into it.
Upstream-Status: Submitted
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
Makefile.obexd | 1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile.obexd b/Makefile.obexd
index 2e33cbc..c8286f0 100644
--- a/Makefile.obexd
+++ b/Makefile.obexd
@@ -105,2 +105,3 @@ obexd/src/plugin.$(OBJEXT): obexd/src/builtin.h
obexd/src/builtin.h: obexd/src/genbuiltin $(obexd_builtin_sources)
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_GEN)$(srcdir)/obexd/src/genbuiltin $(obexd_builtin_modules) > $@
--
2.8.0.rc3