linux-libc-headers: Reinstate scripts-Makefile.headersinst-install-headers-from-sc...

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>

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 be1ef25..9bc5982 100644 (file)
--- 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.
 
 Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
 ---
+RP: Refreshed for 3.10 as the problem still exists there on the autobuilders
+
  scripts/Makefile.headersinst |    4 +++-
  1 files changed, 3 insertions(+), 1 deletions(-)
 
-diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
-index 06ba4a7..536d722 100644
---- a/scripts/Makefile.headersinst
-+++ b/scripts/Makefile.headersinst
-@@ -71,7 +71,7 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@))
+Index: linux-3.10/scripts/Makefile.headersinst
+===================================================================
+--- linux-3.10.orig/scripts/Makefile.headersinst
++++ linux-3.10/scripts/Makefile.headersinst
+@@ -72,7 +72,7 @@ printdir = $(patsubst $(INSTALL_HDR_PATH
  quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\
                              file$(if $(word 2, $(all-files)),s))
        cmd_install = \
--        $(PERL) $< $(installdir) $(SRCARCH) $(input-files); \
-+        xargs $(PERL) $< $(installdir) $(SRCARCH) < $(INSTALL_HDR_PATH)/.input-files; \
+-        $(CONFIG_SHELL) $< $(installdir) $(input-files); \
++        xargs $(CONFIG_SHELL) $< $(installdir) < $(INSTALL_HDR_PATH)/.input-files; \
          for F in $(wrapper-files); do                                   \
                  echo "\#include <asm-generic/$$F>" > $(installdir)/$$F;    \
          done;                                                           \
-@@ -100,7 +100,9 @@ targets += $(install-file)
- $(install-file): scripts/headers_install.pl $(input-files) FORCE
+@@ -101,7 +101,9 @@ targets += $(install-file)
+ $(install-file): scripts/headers_install.sh $(input-files) FORCE
        $(if $(unwanted),$(call cmd,remove),)
        $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))
 +      @echo $(input-files) > $(INSTALL_HDR_PATH)/.input-files
@@ -42,6 +44,3 @@ index 06ba4a7..536d722 100644
  
  else
  __headerscheck: $(subdirs) $(check-file)
--- 
-1.7.0.4
-

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 b2e6f0f..65df230 100644 (file)
--- 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 @@
 require linux-libc-headers.inc
 
 SRC_URI += "file://0001-ptrace.h-remove-ptrace_peeksiginfo_args.patch"
+SRC_URI += "file://scripts-Makefile.headersinst-install-headers-from-sc.patch"
 
 SRC_URI[md5sum] = "72d0a9b3e60cd86fabcd3f24b1708944"
 SRC_URI[sha256sum] = "46c9e55e1fddf40813b8d697d5645037a8e2af5c1a8dff52b3fe82b5021582b8"