diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-01-10 15:49:16 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-10 23:53:47 +0000 |
| commit | 1e63a3b7b7915d40bb59976a02b9f53968997ed3 (patch) | |
| tree | 7a6bc7c598763217fce4c0b96905503178d7b436 /meta | |
| parent | 16c0556808029a0f6a3f91a726b14626e9489498 (diff) | |
| download | openembedded-core-1e63a3b7b7915d40bb59976a02b9f53968997ed3.tar.gz openembedded-core-1e63a3b7b7915d40bb59976a02b9f53968997ed3.tar.bz2 openembedded-core-1e63a3b7b7915d40bb59976a02b9f53968997ed3.zip | |
linux-libc-headers: fix headers install in long path name environments
If a build is started in a deep directory structure, or in a path with
long directory names the installation of linux-libc-headers will fail
with:
| make[2]: execvp: /bin/sh: Argument list too long
| make[2]: ***
>From within the kernel Makefiles themselves.
The solution is to patch the kernel build rules with the following
change:
[
scripts/Makefile.headersinst: install headers from scratch file
If headers_install is executed from a deep/long directory structure, the
shell's maximum argument length can be execeeded, which breaks the operation
with:
| make[2]: execvp: /bin/sh: Argument list too long
| make[2]: ***
By dumping the input files to a scratch file and using xargs to read the
input list from the scratch file, we can avoid blowing out the maximum
argument size and install headers in a long path name environment.
]
Until this change, or a similar one, is merged into the mainline kernel, this
change should be applied to any 3.7 or greater libc-headers build.
Upstream-status: Pending
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
2 files changed, 51 insertions, 0 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 new file mode 100644 index 0000000000..be1ef2502f --- /dev/null +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/scripts-Makefile.headersinst-install-headers-from-sc.patch @@ -0,0 +1,47 @@ +From e60cc1b011bf0f1acdb7e5168b7bed4ebb78c91f Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@windriver.com> +Date: Wed, 9 Jan 2013 16:24:39 -0500 +Subject: [PATCH] scripts/Makefile.headersinst: install headers from scratch file + +If headers_install is executed from a deep/long directory structure, the +shell's maximum argument length can be execeeded, which breaks the operation +with: + +| make[2]: execvp: /bin/sh: Argument list too long +| make[2]: *** + +By dumping the input files to a scratch file and using xargs to read the +input list from the scratch file, we can avoid blowing out the maximum +argument size and install headers in a long path name environment. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> +--- + 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 $@)) + 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; \ + 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 + $(if $(unwanted),$(call cmd,remove),) + $(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@))) ++ @echo $(input-files) > $(INSTALL_HDR_PATH)/.input-files + $(call if_changed,install) ++ @rm $(INSTALL_HDR_PATH)/.input-files + + else + __headerscheck: $(subdirs) $(check-file) +-- +1.7.0.4 + diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.7.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.7.bb index 3d688b76eb..a363289988 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.7.bb +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_3.7.bb @@ -1,4 +1,8 @@ require linux-libc-headers.inc +SRC_URI += "file://scripts-Makefile.headersinst-install-headers-from-sc.patch" + +PR = "r1" + SRC_URI[md5sum] = "5323f3faadd051e83af605a63be5ea2e" SRC_URI[sha256sum] = "dc08d87a579fe2918362e6666e503a95a76296419195cb499aa9dd4dbe171a9e" |