mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

lib/oe/path: Fix copytree functions for tar 1.27

Browse Source 
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 rev: 69c26e795c117aabfaf313abbfd10e70ede633d9)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2013-10-11 23:02:27 +01:00
parent d3846f06d1
commit bf19a8617d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oe/path.py
+2 -2
View File
@@ -81,7 +81,7 @@ def copytree(src, dst):
# This way we also preserve hardlinks between files in the tree. # This way we also preserve hardlinks between files in the tree.
bb.utils.mkdirhier(dst) 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) check_output(cmd, shell=True, stderr=subprocess.STDOUT)
def copyhardlinktree(src, dst): def copyhardlinktree(src, dst):
@@ -93,7 +93,7 @@ def copyhardlinktree(src, dst):
if (os.stat(src).st_dev == os.stat(dst).st_dev): 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 # Need to copy directories only with tar first since cp will error if two
# writers try and create a directory at the same time # 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) check_output(cmd, shell=True, stderr=subprocess.STDOUT)
if os.path.isdir(src): if os.path.isdir(src):
src = src + "/*" src = src + "/*"