mirror of
https://git.yoctoproject.org/poky
synced 2026-02-15 21:23:04 +01:00
7303b67d33
There would be an "Argument list too long" error when the TMPDIR is in a deep dir, for example, when "len(readlink -f TMPDIR) >= 350 (our supported value is 410)". Use "$(foreach ,,$(shell echo))" to fix it. There was already a patch which tried to fix this issue, so squash the current change into the previous one as Bruce suggested. [YOCTO #5138] (From OE-Core rev: 4e10c45d7c61ac1ccf8b53ef525ca03d3d458bba) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
60 lines
2.5 KiB
Diff
60 lines
2.5 KiB
Diff
From b200d4bcffc86bb08fd3898bc7cde00f0686f62d Mon Sep 17 00:00:00 2001
|
|
From: Robert Yang <liezhi.yang@windriver.com>
|
|
Date: Fri, 13 Sep 2013 22:01:02 -0400
|
|
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.
|
|
|
|
Robert:
|
|
Use "$(foreach ,,$(shell echo))" rather than "echo" to make it work when
|
|
len(TMPDIR) <= 410.
|
|
|
|
Upstream-Status: Inappropriate [oe-specific]
|
|
|
|
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
|
|
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
|
---
|
|
RP: Refreshed for 3.10 as the problem still exists there on the autobuilders
|
|
scripts/Makefile.headersinst | 9 ++++++++-
|
|
1 file changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
|
|
--- a/scripts/Makefile.headersinst
|
|
+++ b/scripts/Makefile.headersinst
|
|
@@ -72,7 +72,7 @@ printdir = $(patsubst $(INSTALL_HDR_PATH)/%/,%,$(dir $@))
|
|
quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\
|
|
file$(if $(word 2, $(all-files)),s))
|
|
cmd_install = \
|
|
- $(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; \
|
|
@@ -98,10 +98,17 @@ __headersinst: $(subdirs) $(install-file)
|
|
@:
|
|
|
|
targets += $(install-file)
|
|
+# Use the $(foreach ,,$(shell echo)) to avoid the "Argument list too
|
|
+# long" error, and use the "$(shell echo)" rather than "echo" to keep
|
|
+# the order.
|
|
$(install-file): scripts/headers_install.sh $(input-files) FORCE
|
|
$(if $(unwanted),$(call cmd,remove),)
|
|
$(if $(wildcard $(dir $@)),,$(shell mkdir -p $(dir $@)))
|
|
+ $(shell echo -n > $(INSTALL_HDR_PATH)/.input-files)
|
|
+ $(foreach f,$(input-files),$(shell echo -n "$(f) " >> \
|
|
+ $(INSTALL_HDR_PATH)/.input-files))
|
|
$(call if_changed,install)
|
|
+ @rm $(INSTALL_HDR_PATH)/.input-files
|
|
|
|
else
|
|
__headerscheck: $(subdirs) $(check-file)
|