diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-11 23:02:27 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-11 14:10:46 +0000 |
commit | 233c6f2c96aab8d9acf1f6e2dd1a416e5e49f890 (patch) | |
tree | 0efd7f8565bc928775dcb17663f6f7aecc031906 /meta/lib/oe | |
parent | 90a862ce422e2b823c7fec7b8d4c78e7fb4422a3 (diff) | |
download | poky-233c6f2c96aab8d9acf1f6e2dd1a416e5e49f890.tar.gz |
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)
(From OE-Core rev: da4eb72b29efcf1fba697d0fa060cab8c0a125ab)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-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): | |||
81 | # This way we also preserve hardlinks between files in the tree. | 81 | # This way we also preserve hardlinks between files in the tree. |
82 | 82 | ||
83 | bb.utils.mkdirhier(dst) | 83 | bb.utils.mkdirhier(dst) |
84 | cmd = 'tar -cf - -C %s -ps . | tar -xf - -C %s' % (src, dst) | 84 | cmd = 'tar -cf - -C %s -p . | tar -xf - -C %s' % (src, dst) |
85 | check_output(cmd, shell=True, stderr=subprocess.STDOUT) | 85 | check_output(cmd, shell=True, stderr=subprocess.STDOUT) |
86 | 86 | ||
87 | def copyhardlinktree(src, dst): | 87 | def copyhardlinktree(src, dst): |
@@ -93,7 +93,7 @@ def copyhardlinktree(src, dst): | |||
93 | if (os.stat(src).st_dev == os.stat(dst).st_dev): | 93 | if (os.stat(src).st_dev == os.stat(dst).st_dev): |
94 | # Need to copy directories only with tar first since cp will error if two | 94 | # Need to copy directories only with tar first since cp will error if two |
95 | # writers try and create a directory at the same time | 95 | # writers try and create a directory at the same time |
96 | cmd = 'cd %s; find . -type d -print | tar -cf - -C %s -ps --files-from - | tar -xf - -C %s' % (src, src, dst) | 96 | cmd = 'cd %s; find . -type d -print | tar -cf - -C %s -p --files-from - | tar -xf - -C %s' % (src, src, dst) |
97 | check_output(cmd, shell=True, stderr=subprocess.STDOUT) | 97 | check_output(cmd, shell=True, stderr=subprocess.STDOUT) |
98 | if os.path.isdir(src): | 98 | if os.path.isdir(src): |
99 | src = src + "/*" | 99 | src = src + "/*" |