mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

bluez5: refresh upstreamed patches

Browse Source 
(From OE-Core rev: f217063edd1784811679a384d0d54b34b6b81015)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2019-10-09 16:19:13 +01:00
committed by Richard Purdie
parent 9b607c58ff
commit f3d8fea6c7
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-connectivity/bluez5/bluez5/0001-Makefile.am-Fix-a-race-issue-for-tools.patch
+13 -15
View File
@@ -1,32 +1,30 @@
From 048e1844092cb4b3afd23f16fc2cc70dd2e122b7 Mon Sep 17 00:00:00 2001 Upstream-Status: Backport
From: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Date: Mon, 24 Dec 2018 17:57:14 -0800
Subject: [PATCH] Makefile.am: Fix a race issue for tools
Fixed: From 117c41242c01e057295aed80ed973c6dc7e35fe2 Mon Sep 17 00:00:00 2001
cp ../bluez-5.50/tools/hid2hci.rules tools/97-hid2hci.rules From: Ross Burton <ross.burton@intel.com>
cp: cannot create regular file tools/97-hid2hci.rules: No such file or directory Date: Tue, 8 Oct 2019 11:01:56 +0100
make[1]: *** [tools/97-hid2hci.rules] Error 1 Subject: [PATCH BlueZ] Makefile.am: add missing mkdir in rules generation
Upstream-Status: Submitted[https://www.spinics.net/lists/linux-bluetooth/msg78361.html] In parallel out-of-tree builds it's possible that tools/*.rules are
generated before the target directory has been implicitly created. Solve this by
Signed-off-by: Robert Yang <liezhi.yang@windriver.com> creating the directory before writing into it.
--- ---
Makefile.am | 1 + Makefile.am | 1 +
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/Makefile.am b/Makefile.am diff --git a/Makefile.am b/Makefile.am
index 6d1ff11..35a01f2 100644 index 2ac28b23d..e7bcd2366 100644
--- a/Makefile.am --- a/Makefile.am
+++ b/Makefile.am +++ b/Makefile.am
@@ -504,6 +504,7 @@ src/builtin.h: src/genbuiltin $(builtin_sources) @@ -589,6 +589,7 @@ src/builtin.h: src/genbuiltin $(builtin_sources)
$(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@ $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@
tools/%.rules: tools/%.rules:
+ [ -e tools ] || $(MKDIR_P) tools + $(AM_V_at)$(MKDIR_P) tools
$(AM_V_GEN)cp $(srcdir)/$(subst 97-,,$@) $@ $(AM_V_GEN)cp $(srcdir)/$(subst 97-,,$@) $@
$(lib_libbluetooth_la_OBJECTS): $(local_headers) $(lib_libbluetooth_la_OBJECTS): $(local_headers)
-- --
2.10.2 2.20.1
meta/recipes-connectivity/bluez5/bluez5/out-of-tree.patch
+1 -1
View File
@@ -7,7 +7,7 @@ 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 generated before the target directory has been implicitly created. Solve this by
creating the directory before writing into it. creating the directory before writing into it.
Upstream-Status: Submitted Upstream-Status: Backport
Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
--- ---
Makefile.obexd | 1 + Makefile.obexd | 1 +