summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-26 08:20:07 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-26 11:29:45 +0100
commite67ce0d62f2202ff233f09a8feb8aaf4393f913a (patch)
treed536ff69b911f1cfe4fe6059c5ee95d6d7833fe7
parent126227582a06fecb4971315be6aa72be07636ac4 (diff)
downloadpoky-e67ce0d62f2202ff233f09a8feb8aaf4393f913a.tar.gz
linux-libc-headers: Reinstate scripts-Makefile.headersinst-install-headers-from-sc.patch
The autobuilders and their long paths are still triggering errors during the headers installation. Reinstate the previous patch for this, after updating for 3.10. (From OE-Core rev: fe4428fd740b3937007e0a3f893714ff04c33533) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers/scripts-Makefile.headersinst-install-headers-from-sc.patch23
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb1
2 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/scripts-Makefile.headersinst-install-headers-from-sc.patch b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/scripts-Makefile.headersinst-install-headers-from-sc.patch
index be1ef2502f..9bc59823a3 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/scripts-Makefile.headersinst-install-headers-from-sc.patch
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/scripts-Makefile.headersinst-install-headers-from-sc.patch
@@ -16,24 +16,26 @@ argument size and install headers in a long path name environment.
16 16
17Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> 17Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
18--- 18---
19RP: Refreshed for 3.10 as the problem still exists there on the autobuilders
20
19 scripts/Makefile.headersinst | 4 +++- 21 scripts/Makefile.headersinst | 4 +++-
20 1 files changed, 3 insertions(+), 1 deletions(-) 22 1 files changed, 3 insertions(+), 1 deletions(-)
21 23
22diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst 24Index: linux-3.10/scripts/Makefile.headersinst
23index 06ba4a7..536d722 100644 25===================================================================
24--- a/scripts/Makefile.headersinst 26--- linux-3.10.orig/scripts/Makefile.headersinst
25+++ b/scripts/Makefile.headersinst 27+++ linux-3.10/scripts/Makefile.headersinst
26@@ -71,7 +71,7 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@)) 28@@ -72,7 +72,7 @@ printdir = $(patsubst $(INSTALL_HDR_PATH
27 quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\ 29 quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\
28 file$(if $(word 2, $(all-files)),s)) 30 file$(if $(word 2, $(all-files)),s))
29 cmd_install = \ 31 cmd_install = \
30- $(PERL) $< $(installdir) $(SRCARCH) $(input-files); \ 32- $(CONFIG_SHELL) $< $(installdir) $(input-files); \
31+ xargs $(PERL) $< $(installdir) $(SRCARCH) < $(INSTALL_HDR_PATH)/.input-files; \ 33+ xargs $(CONFIG_SHELL) $< $(installdir) < $(INSTALL_HDR_PATH)/.input-files; \
32 for F in $(wrapper-files); do \ 34 for F in $(wrapper-files); do \
33 echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \ 35 echo "\#include <asm-generic/$$F>" > $(installdir)/$$F; \
34 done; \ 36 done; \
35@@ -100,7 +100,9 @@ targets += $(install-file) 37@@ -101,7 +101,9 @@ targets += $(install-file)
36 $(install-file): scripts/headers_install.pl $(input-files) FORCE 38 $(install-file): scripts/headers_install.sh $(input-files) FORCE
37 $(if $(unwanted),$(call cmd,remove),) 39 $(if $(unwanted),$(call cmd,remove),)
38 $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@))) 40 $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))
39+ @echo $(input-files) > $(INSTALL_HDR_PATH)/.input-files 41+ @echo $(input-files) > $(INSTALL_HDR_PATH)/.input-files
@@ -42,6 +44,3 @@ index 06ba4a7..536d722 100644
42 44
43 else 45 else
44 __headerscheck: $(subdirs) $(check-file) 46 __headerscheck: $(subdirs) $(check-file)
45--
461.7.0.4
47
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb
index b2e6f0f643..65df230c4b 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb
@@ -1,6 +1,7 @@
1require linux-libc-headers.inc 1require linux-libc-headers.inc
2 2
3SRC_URI += "file://0001-ptrace.h-remove-ptrace_peeksiginfo_args.patch" 3SRC_URI += "file://0001-ptrace.h-remove-ptrace_peeksiginfo_args.patch"
4SRC_URI += "file://scripts-Makefile.headersinst-install-headers-from-sc.patch"
4 5
5SRC_URI[md5sum] = "72d0a9b3e60cd86fabcd3f24b1708944" 6SRC_URI[md5sum] = "72d0a9b3e60cd86fabcd3f24b1708944"
6SRC_URI[sha256sum] = "46c9e55e1fddf40813b8d697d5645037a8e2af5c1a8dff52b3fe82b5021582b8" 7SRC_URI[sha256sum] = "46c9e55e1fddf40813b8d697d5645037a8e2af5c1a8dff52b3fe82b5021582b8"