summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2018-12-28 01:01:48 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-03 12:35:53 +0000
commitdad40851a0e867ee7a7f7da55d1b27fe40a55f4f (patch)
tree3abd74c1b4f2c068143bc3dd036570ee4620d279 /meta/recipes-connectivity
parent0e7c84b69e53b37dc2850e4060e99b805658e374 (diff)
downloadpoky-dad40851a0e867ee7a7f7da55d1b27fe40a55f4f.tar.gz
bluez5: 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 (From OE-Core rev: 5cb2b165cf89a307531e199248bc98fb51541521) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5.inc1
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5/0001-Makefile.am-Fix-a-race-issue-for-tools.patch32
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 = "\
52 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \ 52 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', 'file://0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch', d)} \
53 file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \ 53 file://0001-tests-add-a-target-for-building-tests-without-runnin.patch \
54 file://0001-test-gatt-Fix-hung-issue.patch \ 54 file://0001-test-gatt-Fix-hung-issue.patch \
55 file://0001-Makefile.am-Fix-a-race-issue-for-tools.patch \
55" 56"
56S = "${WORKDIR}/bluez-${PV}" 57S = "${WORKDIR}/bluez-${PV}"
57 58
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 @@
1From 048e1844092cb4b3afd23f16fc2cc70dd2e122b7 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Mon, 24 Dec 2018 17:57:14 -0800
4Subject: [PATCH] Makefile.am: Fix a race issue for tools
5
6Fixed:
7cp ../bluez-5.50/tools/hid2hci.rules tools/97-hid2hci.rules
8cp: cannot create regular file tools/97-hid2hci.rules: No such file or directory
9make[1]: *** [tools/97-hid2hci.rules] Error 1
10
11Upstream-Status: Submitted[https://www.spinics.net/lists/linux-bluetooth/msg78361.html]
12
13Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
14---
15 Makefile.am | 1 +
16 1 file changed, 1 insertion(+)
17
18diff --git a/Makefile.am b/Makefile.am
19index 6d1ff11..35a01f2 100644
20--- a/Makefile.am
21+++ b/Makefile.am
22@@ -504,6 +504,7 @@ src/builtin.h: src/genbuiltin $(builtin_sources)
23 $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@
24
25 tools/%.rules:
26+ [ -e tools ] || $(MKDIR_P) tools
27 $(AM_V_GEN)cp $(srcdir)/$(subst 97-,,$@) $@
28
29 $(lib_libbluetooth_la_OBJECTS): $(local_headers)
30--
312.10.2
32