aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-03-14 01:45:45 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-27 10:48:54 +0100
commitbefda6ce3fd916ab04c035d1d82ed173759f7f09 (patch)
tree71d54f2412440d7d560098ceed4c698617fbca61
parent4c353eeff45f91533f22392f129bc5a477ee5207 (diff)
downloadopenembedded-core-befda6ce3fd916ab04c035d1d82ed173759f7f09.tar.gz
openembedded-core-befda6ce3fd916ab04c035d1d82ed173759f7f09.tar.bz2
openembedded-core-befda6ce3fd916ab04c035d1d82ed173759f7f09.zip
oe/path.py: fix for "Argument list too long"
Issue: LIN9-1648 Fixed when len(TMPDIR) = 410: $ bitbake core-image-sato-sdk [snip] Subprocess output: /bin/sh: /bin/cp: Argument list too long ERROR: core-image-sato-sdk-1.0-r0 do_rootfs: Function failed: do_rootfs [snip] This is because "copyhardlinktree(src, dst)" does "cp -afl src/* dst", while src/* is expanded to "src/file1 src/file2, src/file3..." which causes the "Argument list too long", use ./* as src and change cwd in subprocess.check_output() to fix the problem. (From OE-Core rev: a3dc93eb25fba32109edd1db6e8766074fb52e4b) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/path.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py
index 06a5af2659..ed7fd1eef0 100644
--- a/meta/lib/oe/path.py
+++ b/meta/lib/oe/path.py
@@ -83,12 +83,14 @@ def copyhardlinktree(src, dst):
if os.path.isdir(src):
import glob
if len(glob.glob('%s/.??*' % src)) > 0:
- source = '%s/.??* ' % src
- source = source + '%s/*' % src
+ source = './.??* '
+ source += './*'
+ s_dir = src
else:
source = src
- cmd = 'cp -afl --preserve=xattr %s %s' % (source, dst)
- subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
+ s_dir = os.getcwd()
+ cmd = 'cp -afl --preserve=xattr %s %s' % (source, os.path.realpath(dst))
+ subprocess.check_output(cmd, shell=True, cwd=s_dir, stderr=subprocess.STDOUT)
else:
copytree(src, dst)