diff options
| author | Ross Burton <ross.burton@intel.com> | 2016-04-22 16:16:06 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-29 07:53:58 +0100 |
| commit | 471fdafb340e90a4ab2e31854f69d5204e9380bf (patch) | |
| tree | e8910d3b5f0e8ca5431c00f5d462a2e68bc73fb7 /meta | |
| parent | e8d4e80e5cc98e2e0470c85f3c08574d30d466c1 (diff) | |
| download | openembedded-core-471fdafb340e90a4ab2e31854f69d5204e9380bf.tar.gz openembedded-core-471fdafb340e90a4ab2e31854f69d5204e9380bf.tar.bz2 openembedded-core-471fdafb340e90a4ab2e31854f69d5204e9380bf.zip | |
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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -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 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," SRC_URI = "\ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.xz \ + file://out-of-tree.patch \ file://init \ file://run-ptest \ ${@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}" -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 = "\ --enable-tools \ @@ -108,5 +109,5 @@ do_compile_ptest() { do_install_ptest() { 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 } 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 @@ +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 + |