diff options
author | Ross Burton <ross.burton@intel.com> | 2016-04-22 16:16:06 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-29 19:35:55 +0100 |
commit | 0df81c8485b50d836927d45f3e1c4f2d397fd97c (patch) | |
tree | a07af7ae895422ab5a521b053cfb8abf52a6d8ee /meta/recipes-connectivity | |
parent | 2aae36ea43781829be2c0799e0db4f03db006a0d (diff) | |
download | poky-0df81c8485b50d836927d45f3e1c4f2d397fd97c.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)
(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>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5.inc | 5 | ||||
-rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5/out-of-tree.patch | 26 |
2 files changed, 29 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 01c64e8c6f..b3cd8ed5ca 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 | ||
19 | SRC_URI = "\ | 19 | SRC_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 | " |
26 | S = "${WORKDIR}/bluez-${PV}" | 27 | S = "${WORKDIR}/bluez-${PV}" |
27 | 28 | ||
28 | inherit autotools-brokensep pkgconfig systemd update-rc.d distro_features_check ptest | 29 | inherit autotools pkgconfig systemd update-rc.d distro_features_check ptest |
29 | 30 | ||
30 | EXTRA_OECONF = "\ | 31 | EXTRA_OECONF = "\ |
31 | --enable-tools \ | 32 | --enable-tools \ |
@@ -112,5 +113,5 @@ do_compile_ptest() { | |||
112 | 113 | ||
113 | do_install_ptest() { | 114 | do_install_ptest() { |
114 | cp -r ${B}/unit/ ${D}${PTEST_PATH} | 115 | cp -r ${B}/unit/ ${D}${PTEST_PATH} |
115 | rm ${D}${PTEST_PATH}/unit/*.c ${D}${PTEST_PATH}/unit/*.o | 116 | rm -f ${D}${PTEST_PATH}/unit/*.o |
116 | } | 117 | } |
diff --git a/meta/recipes-connectivity/bluez5/bluez5/out-of-tree.patch b/meta/recipes-connectivity/bluez5/bluez5/out-of-tree.patch new file mode 100644 index 0000000000..3ee79d7047 --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5/out-of-tree.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From ed55b49a226ca3909f52416be2ae5ce1c5ca2cb2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@intel.com> | ||
3 | Date: Fri, 22 Apr 2016 15:40:37 +0100 | ||
4 | Subject: [PATCH] Makefile.obexd: add missing mkdir in builtin.h generation | ||
5 | |||
6 | In parallel out-of-tree builds it's possible that obexd/src/builtin.h is | ||
7 | generated before the target directory has been implicitly created. Solve this by | ||
8 | creating the directory before writing into it. | ||
9 | |||
10 | Upstream-Status: Submitted | ||
11 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
12 | --- | ||
13 | Makefile.obexd | 1 + | ||
14 | 1 file changed, 1 insertion(+) | ||
15 | |||
16 | diff --git a/Makefile.obexd b/Makefile.obexd | ||
17 | index 2e33cbc..c8286f0 100644 | ||
18 | --- a/Makefile.obexd | ||
19 | +++ b/Makefile.obexd | ||
20 | @@ -105,2 +105,3 @@ obexd/src/plugin.$(OBJEXT): obexd/src/builtin.h | ||
21 | obexd/src/builtin.h: obexd/src/genbuiltin $(obexd_builtin_sources) | ||
22 | + $(AM_V_at)$(MKDIR_P) $(dir $@) | ||
23 | $(AM_V_GEN)$(srcdir)/obexd/src/genbuiltin $(obexd_builtin_modules) > $@ | ||
24 | -- | ||
25 | 2.8.0.rc3 | ||
26 | |||