diff options
| -rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-connectivity/bluez5/bluez5/0001-Makefile.am-Fix-a-race-issue-for-tools.patch | 32 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 7708e7c88b..6d62f52459 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -52,6 +52,7 @@ SRC_URI = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \ file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ file://0001-test-gatt-Fix-hung-issue.patch \ + file://0001-Makefile.am-Fix-a-race-issue-for-tools.patch \ " S = "${WORKDIR}/bluez-${PV}" diff --git a/meta/recipes-connectivity/bluez5/bluez5/0001-Makefile.am-Fix-a-race-issue-for-tools.patch b/meta/recipes-connectivity/bluez5/bluez5/0001-Makefile.am-Fix-a-race-issue-for-tools.patch new file mode 100644 index 0000000000..3c227a8ea2 --- /dev/null +++ b/meta/recipes-connectivity/bluez5/bluez5/0001-Makefile.am-Fix-a-race-issue-for-tools.patch @@ -0,0 +1,32 @@ +From 048e1844092cb4b3afd23f16fc2cc70dd2e122b7 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Mon, 24 Dec 2018 17:57:14 -0800 +Subject: [PATCH] Makefile.am: Fix a race issue for tools + +Fixed: +cp ../bluez-5.50/tools/hid2hci.rules tools/97-hid2hci.rules +cp: cannot create regular file tools/97-hid2hci.rules: No such file or directory +make[1]: *** [tools/97-hid2hci.rules] Error 1 + +Upstream-Status: Submitted[https://www.spinics.net/lists/linux-bluetooth/msg78361.html] + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.am b/Makefile.am +index 6d1ff11..35a01f2 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -504,6 +504,7 @@ src/builtin.h: src/genbuiltin $(builtin_sources) + $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@ + + tools/%.rules: ++ [ -e tools ] || $(MKDIR_P) tools + $(AM_V_GEN)cp $(srcdir)/$(subst 97-,,$@) $@ + + $(lib_libbluetooth_la_OBJECTS): $(local_headers) +-- +2.10.2 + |