summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/bluez5
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-10-09 16:19:13 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-23 16:30:36 +0100
commitf3d8fea6c7f6ed798d838d282c252df4d9a9865a (patch)
treebf43b376897c9701c612eac077e3117a7ef922d2 /meta/recipes-connectivity/bluez5
parent9b607c58ffa3c8d19e55b5ff8c52e8a6a2f6ae32 (diff)
downloadpoky-f3d8fea6c7f6ed798d838d282c252df4d9a9865a.tar.gz
bluez5: refresh upstreamed patches
(From OE-Core rev: f217063edd1784811679a384d0d54b34b6b81015) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/bluez5')
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5/0001-Makefile.am-Fix-a-race-issue-for-tools.patch28
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5/out-of-tree.patch2
2 files changed, 14 insertions, 16 deletions
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
index 3c227a8ea2..b6cb978393 100644
--- 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
@@ -1,32 +1,30 @@
1From 048e1844092cb4b3afd23f16fc2cc70dd2e122b7 Mon Sep 17 00:00:00 2001 1Upstream-Status: Backport
2From: Robert Yang <liezhi.yang@windriver.com> 2Signed-off-by: Ross Burton <ross.burton@intel.com>
3Date: Mon, 24 Dec 2018 17:57:14 -0800
4Subject: [PATCH] Makefile.am: Fix a race issue for tools
5 3
6Fixed: 4From 117c41242c01e057295aed80ed973c6dc7e35fe2 Mon Sep 17 00:00:00 2001
7cp ../bluez-5.50/tools/hid2hci.rules tools/97-hid2hci.rules 5From: Ross Burton <ross.burton@intel.com>
8cp: cannot create regular file tools/97-hid2hci.rules: No such file or directory 6Date: Tue, 8 Oct 2019 11:01:56 +0100
9make[1]: *** [tools/97-hid2hci.rules] Error 1 7Subject: [PATCH BlueZ] Makefile.am: add missing mkdir in rules generation
10 8
11Upstream-Status: Submitted[https://www.spinics.net/lists/linux-bluetooth/msg78361.html] 9In parallel out-of-tree builds it's possible that tools/*.rules are
12 10generated before the target directory has been implicitly created. Solve this by
13Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 11creating the directory before writing into it.
14--- 12---
15 Makefile.am | 1 + 13 Makefile.am | 1 +
16 1 file changed, 1 insertion(+) 14 1 file changed, 1 insertion(+)
17 15
18diff --git a/Makefile.am b/Makefile.am 16diff --git a/Makefile.am b/Makefile.am
19index 6d1ff11..35a01f2 100644 17index 2ac28b23d..e7bcd2366 100644
20--- a/Makefile.am 18--- a/Makefile.am
21+++ b/Makefile.am 19+++ b/Makefile.am
22@@ -504,6 +504,7 @@ src/builtin.h: src/genbuiltin $(builtin_sources) 20@@ -589,6 +589,7 @@ src/builtin.h: src/genbuiltin $(builtin_sources)
23 $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@ 21 $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@
24 22
25 tools/%.rules: 23 tools/%.rules:
26+ [ -e tools ] || $(MKDIR_P) tools 24+ $(AM_V_at)$(MKDIR_P) tools
27 $(AM_V_GEN)cp $(srcdir)/$(subst 97-,,$@) $@ 25 $(AM_V_GEN)cp $(srcdir)/$(subst 97-,,$@) $@
28 26
29 $(lib_libbluetooth_la_OBJECTS): $(local_headers) 27 $(lib_libbluetooth_la_OBJECTS): $(local_headers)
30-- 28--
312.10.2 292.20.1
32 30
diff --git a/meta/recipes-connectivity/bluez5/bluez5/out-of-tree.patch b/meta/recipes-connectivity/bluez5/bluez5/out-of-tree.patch
index 3ee79d7047..76ed779258 100644
--- a/meta/recipes-connectivity/bluez5/bluez5/out-of-tree.patch
+++ b/meta/recipes-connectivity/bluez5/bluez5/out-of-tree.patch
@@ -7,7 +7,7 @@ In parallel out-of-tree builds it's possible that obexd/src/builtin.h is
7generated before the target directory has been implicitly created. Solve this by 7generated before the target directory has been implicitly created. Solve this by
8creating the directory before writing into it. 8creating the directory before writing into it.
9 9
10Upstream-Status: Submitted 10Upstream-Status: Backport
11Signed-off-by: Ross Burton <ross.burton@intel.com> 11Signed-off-by: Ross Burton <ross.burton@intel.com>
12--- 12---
13 Makefile.obexd | 1 + 13 Makefile.obexd | 1 +