diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-11 23:02:27 +0100 |
|---|---|---|
| committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-12-03 16:49:23 +0000 |
| commit | da4eb72b29efcf1fba697d0fa060cab8c0a125ab (patch) | |
| tree | 5d28a12c162cc9a6750166b3f0d5670faf4e0623 | |
| parent | 5e3ec61bacd393d461498d9e090306cc7bd8fa63 (diff) | |
| download | openembedded-core-da4eb72b29efcf1fba697d0fa060cab8c0a125ab.tar.gz openembedded-core-da4eb72b29efcf1fba697d0fa060cab8c0a125ab.tar.bz2 openembedded-core-da4eb72b29efcf1fba697d0fa060cab8c0a125ab.zip | |
lib/oe/path: Fix copytree functions for tar 1.27
tar version 1.27 returns:
tar: --same-order option cannot be used with -c
with the commandlines we have been using. We can remove the -s option (which
is --same-order) to remove the error.
(From OE-Core master rev: 69c26e795c117aabfaf313abbfd10e70ede633d9)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oe/path.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py index 76a6ed8314..be66c148ff 100644 --- a/meta/lib/oe/path.py +++ b/meta/lib/oe/path.py @@ -81,7 +81,7 @@ def copytree(src, dst): # This way we also preserve hardlinks between files in the tree. bb.utils.mkdirhier(dst) - cmd = 'tar -cf - -C %s -ps . | tar -xf - -C %s' % (src, dst) + cmd = 'tar -cf - -C %s -p . | tar -xf - -C %s' % (src, dst) check_output(cmd, shell=True, stderr=subprocess.STDOUT) def copyhardlinktree(src, dst): @@ -93,7 +93,7 @@ def copyhardlinktree(src, dst): if (os.stat(src).st_dev == os.stat(dst).st_dev): # Need to copy directories only with tar first since cp will error if two # writers try and create a directory at the same time - cmd = 'cd %s; find . -type d -print | tar -cf - -C %s -ps --files-from - | tar -xf - -C %s' % (src, src, dst) + cmd = 'cd %s; find . -type d -print | tar -cf - -C %s -p --files-from - | tar -xf - -C %s' % (src, src, dst) check_output(cmd, shell=True, stderr=subprocess.STDOUT) if os.path.isdir(src): src = src + "/*" |