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:35:26 +0000 |
| commit | 4b6762b924a561febede13b85330309dbf75da19 (patch) | |
| tree | 2c5ef945e227ba50a25988680ce5b2773003ac98 /meta/recipes-connectivity | |
| parent | 482c0c44e6efffed826cbc621a039dd0950847f8 (diff) | |
| download | openembedded-core-4b6762b924a561febede13b85330309dbf75da19.tar.gz openembedded-core-4b6762b924a561febede13b85330309dbf75da19.tar.bz2 openembedded-core-4b6762b924a561febede13b85330309dbf75da19.zip | |
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
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'meta/recipes-connectivity')
| -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 @@ +From 43acc56d5506c7e318f717fb3634bc16e3438913 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Thu, 15 Jan 2015 18:12:07 -0800 +Subject: [PATCH] Makefile.am: fix parallel issue + +There might be no src dir if 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 + +Upstream-Status: Pending + +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 3241311..a43eaa2 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -164,6 +164,7 @@ MAINTAINERCLEANFILES = Makefile.in \ + src/plugin.$(OBJEXT): src/builtin.h + + src/builtin.h: src/genbuiltin $(builtin_sources) ++ $(AM_V_at)$(MKDIR_P) src + $(AM_V_GEN)$(srcdir)/src/genbuiltin $(builtin_modules) > $@ + + $(src_neard_OBJECTS) \ +-- +1.7.9.5 + 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 \ file://parallel-build.patch \ file://neard.in \ file://neard.service.in \ + file://Makefile.am-fix-parallel-issue.patch \ " SRC_URI[md5sum] = "692ba2653d60155255244c87396c486b" SRC_URI[sha256sum] = "6ea724b443d39d679168fc7776a965d1f64727c3735391df2c01469ee7cd8cca" |