summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-02-12 00:42:46 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-15 21:58:26 +0000
commitf404ab2563da359c076039324127ff534577df81 (patch)
treec3a69fbe293382dd0fbcbcba90c1822951e0d1c1 /meta/recipes-connectivity
parent146f28ad199e59059b221b30f1caec6a7fb55ff8 (diff)
downloadpoky-f404ab2563da359c076039324127ff534577df81.tar.gz
neard: do not ship version.h
The HEADERS' name has been changed to pkginclude_HEADERS, so use nodist_pkginclude_HEADERS, otherwise version.h would be shipped. It would cause other pkgs failed to build if ship version.h to usr/include/version.h (From OE-Core rev: 2025284acf8999d254c671b5e259587a4171858f) 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/neard/neard/Makefile.am-do-not-ship-version.h.patch36
-rw-r--r--meta/recipes-connectivity/neard/neard_0.15.bb1
2 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch b/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch
new file mode 100644
index 0000000000..16875e0543
--- /dev/null
+++ b/meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch
@@ -0,0 +1,36 @@
1From bfd32d68cfc9f1e31dab88e07446d1c02bc80b5e Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 12 Feb 2015 00:39:29 -0800
4Subject: [PATCH] Makefile.am: do not ship version.h
5
6The HEADERS' name has been changed to pkginclude_HEADERS, so use
7nodist_pkginclude_HEADERS, otherwise version.h would be shipped.
8
9Upstream-Status: Pending
10
11Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
12---
13 Makefile.am | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/Makefile.am b/Makefile.am
17index 3334790..69cd58f 100644
18--- a/Makefile.am
19+++ b/Makefile.am
20@@ -10,11 +10,11 @@ pkginclude_HEADERS = include/types.h include/log.h include/plugin.h \
21 include/tlv.h include/setting.h include/device.h \
22 include/nfc_copy.h include/snep.h
23
24-nodist_include_HEADERS = include/version.h
25+nodist_pkginclude_HEADERS = include/version.h
26
27 noinst_HEADERS = include/dbus.h
28
29-local_headers = $(foreach file,$(pkginclude_HEADERS) $(nodist_include_HEADERS) \
30+local_headers = $(foreach file,$(pkginclude_HEADERS) $(nodist_pkginclude_HEADERS) \
31 $(noinst_HEADERS), include/near/$(notdir $(file)))
32
33 gdbus_sources = gdbus/gdbus.h gdbus/mainloop.c gdbus/watch.c \
34--
351.7.9.5
36
diff --git a/meta/recipes-connectivity/neard/neard_0.15.bb b/meta/recipes-connectivity/neard/neard_0.15.bb
index c92a171301..508c622801 100644
--- a/meta/recipes-connectivity/neard/neard_0.15.bb
+++ b/meta/recipes-connectivity/neard/neard_0.15.bb
@@ -3,6 +3,7 @@ require neard.inc
3SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BP}.tar.xz \ 3SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BP}.tar.xz \
4 file://neard.in \ 4 file://neard.in \
5 file://Makefile.am-fix-parallel-issue.patch \ 5 file://Makefile.am-fix-parallel-issue.patch \
6 file://Makefile.am-do-not-ship-version.h.patch \
6 " 7 "
7SRC_URI[md5sum] = "b746ce62eeef88e8de90765e00a75a1c" 8SRC_URI[md5sum] = "b746ce62eeef88e8de90765e00a75a1c"
8SRC_URI[sha256sum] = "651f6513d32cdaf8a426255d03aff38a6620a89b0567ec2b36606c6330a93353" 9SRC_URI[sha256sum] = "651f6513d32cdaf8a426255d03aff38a6620a89b0567ec2b36606c6330a93353"