diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-01-15 18:24:07 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-23 11:36:28 +0000 |
commit | 7cd72306bf956a652405f74b76ccd869350e5dd4 (patch) | |
tree | ec2e6cff117105d4c64d6057302e3a1d8d7b4bcf /meta/recipes-connectivity/neard | |
parent | 940c4179cca43567cea31967ea6600aeea5687aa (diff) | |
download | poky-7cd72306bf956a652405f74b76ccd869350e5dd4.tar.gz |
neard: fix parallel issue
There might be no src dir if the src/builtin.h runs earlier, create it
to fix the race issue:
src/genbuiltin nfctype1 nfctype2 nfctype3 nfctype4 p2p > src/builtin.h
/bin/sh: src/builtin.h: No such file or directory
(From OE-Core rev: 4b6762b924a561febede13b85330309dbf75da19)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/neard')
-rw-r--r-- | meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch | 33 | ||||
-rw-r--r-- | meta/recipes-connectivity/neard/neard_0.14.bb | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch b/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch new file mode 100644 index 0000000000..466067693d --- /dev/null +++ b/meta/recipes-connectivity/neard/neard/Makefile.am-fix-parallel-issue.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 43acc56d5506c7e318f717fb3634bc16e3438913 Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Thu, 15 Jan 2015 18:12:07 -0800 | ||
4 | Subject: [PATCH] Makefile.am: fix parallel issue | ||
5 | |||
6 | There might be no src dir if src/builtin.h runs earlier, create it to | ||
7 | fix the race issue: | ||
8 | |||
9 | src/genbuiltin nfctype1 nfctype2 nfctype3 nfctype4 p2p > src/builtin.h | ||
10 | /bin/sh: src/builtin.h: No such file or directory | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
15 | --- | ||
16 | Makefile.am | 1 + | ||
17 | 1 file changed, 1 insertion(+) | ||
18 | |||
19 | diff --git a/Makefile.am b/Makefile.am | ||
20 | index 3241311..a43eaa2 100644 | ||
21 | --- a/Makefile.am | ||
22 | +++ b/Makefile.am | ||
23 | @@ -164,6 +164,7 @@ MAINTAINERCLEANFILES = Makefile.in \ | ||
24 | src/plugin.$(OBJEXT): src/builtin.h | ||
25 | |||
26 | src/builtin.h: src/genbuiltin $(builtin_sources) | ||
27 | + $(AM_V_at)$(MKDIR_P) src | ||
28 | $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@ | ||
29 | |||
30 | $(src_neard_OBJECTS) \ | ||
31 | -- | ||
32 | 1.7.9.5 | ||
33 | |||
diff --git a/meta/recipes-connectivity/neard/neard_0.14.bb b/meta/recipes-connectivity/neard/neard_0.14.bb index daf3a4b7d1..2fb47cc3d7 100644 --- a/meta/recipes-connectivity/neard/neard_0.14.bb +++ b/meta/recipes-connectivity/neard/neard_0.14.bb | |||
@@ -4,6 +4,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BPN}-${PV}.tar.xz \ | |||
4 | file://parallel-build.patch \ | 4 | file://parallel-build.patch \ |
5 | file://neard.in \ | 5 | file://neard.in \ |
6 | file://neard.service.in \ | 6 | file://neard.service.in \ |
7 | file://Makefile.am-fix-parallel-issue.patch \ | ||
7 | " | 8 | " |
8 | SRC_URI[md5sum] = "692ba2653d60155255244c87396c486b" | 9 | SRC_URI[md5sum] = "692ba2653d60155255244c87396c486b" |
9 | SRC_URI[sha256sum] = "6ea724b443d39d679168fc7776a965d1f64727c3735391df2c01469ee7cd8cca" | 10 | SRC_URI[sha256sum] = "6ea724b443d39d679168fc7776a965d1f64727c3735391df2c01469ee7cd8cca" |