diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2017-03-14 01:45:45 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-17 16:52:43 +0000 |
| commit | a3dc93eb25fba32109edd1db6e8766074fb52e4b (patch) | |
| tree | 2776e7c374ae346f6fc31865425457bf512a3c74 | |
| parent | f346a9bdc372ec477bafcda358f9339ff4e4c79d (diff) | |
| download | openembedded-core-contrib-a3dc93eb25fba32109edd1db6e8766074fb52e4b.tar.gz | |
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.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/lib/oe/path.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py index a2a50c5b39..448a2b944e 100644 --- a/meta/lib/oe/path.py +++ b/meta/lib/oe/path.py @@ -103,12 +103,14 @@ def copyhardlinktree(src, dst): source = '' if os.path.isdir(src): 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) |