diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2015-02-12 00:42:46 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-14 22:26:09 +0000 |
| commit | 2025284acf8999d254c671b5e259587a4171858f (patch) | |
| tree | 0bca29ce8a62a241569ba1ac1d5318cce5613b77 | |
| parent | 82166e514438eb1b562f2a4dc2f9f8fecf3f60df (diff) | |
| download | openembedded-core-2025284acf8999d254c671b5e259587a4171858f.tar.gz openembedded-core-2025284acf8999d254c671b5e259587a4171858f.tar.bz2 openembedded-core-2025284acf8999d254c671b5e259587a4171858f.zip | |
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
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
| -rw-r--r-- | meta/recipes-connectivity/neard/neard/Makefile.am-do-not-ship-version.h.patch | 36 | ||||
| -rw-r--r-- | meta/recipes-connectivity/neard/neard_0.15.bb | 1 |
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 @@ +From bfd32d68cfc9f1e31dab88e07446d1c02bc80b5e Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Thu, 12 Feb 2015 00:39:29 -0800 +Subject: [PATCH] Makefile.am: 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. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 3334790..69cd58f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -10,11 +10,11 @@ pkginclude_HEADERS = include/types.h include/log.h include/plugin.h \ + include/tlv.h include/setting.h include/device.h \ + include/nfc_copy.h include/snep.h + +-nodist_include_HEADERS = include/version.h ++nodist_pkginclude_HEADERS = include/version.h + + noinst_HEADERS = include/dbus.h + +-local_headers = $(foreach file,$(pkginclude_HEADERS) $(nodist_include_HEADERS) \ ++local_headers = $(foreach file,$(pkginclude_HEADERS) $(nodist_pkginclude_HEADERS) \ + $(noinst_HEADERS), include/near/$(notdir $(file))) + + gdbus_sources = gdbus/gdbus.h gdbus/mainloop.c gdbus/watch.c \ +-- +1.7.9.5 + 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 SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BP}.tar.xz \ file://neard.in \ file://Makefile.am-fix-parallel-issue.patch \ + file://Makefile.am-do-not-ship-version.h.patch \ " SRC_URI[md5sum] = "b746ce62eeef88e8de90765e00a75a1c" SRC_URI[sha256sum] = "651f6513d32cdaf8a426255d03aff38a6620a89b0567ec2b36606c6330a93353" |