diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-08 22:13:38 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-12 10:34:09 +0000 |
commit | c3935362109b2d446d6a0fcb35de51c9ecbca601 (patch) | |
tree | b0726b23d1e258822d94cdc5ae0bcea0fa8dbc0f /meta/lib/oe/path.py | |
parent | 8a07a176d70b8dd1f3a735681e91352cba27bef2 (diff) | |
download | poky-c3935362109b2d446d6a0fcb35de51c9ecbca601.tar.gz |
lib/oe/path: Fixup handling of .* files in top level paths for copyhardlinktree()
Files named .* in the top level of directories handled by this function
were getting lost after the directory copying command was fixed. Rather
than complicate the function further, use cpio instead.
(From OE-Core rev: 59612905e9bb865762667aa7b3cb06e53c3a4071)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/path.py')
-rw-r--r-- | meta/lib/oe/path.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py index d0588baf15..46783f8668 100644 --- a/meta/lib/oe/path.py +++ b/meta/lib/oe/path.py | |||
@@ -95,9 +95,7 @@ def copyhardlinktree(src, dst): | |||
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 -p --files-from - --no-recursion | tar -xf - -C %s' % (src, src, dst) | 96 | cmd = 'cd %s; find . -type d -print | tar -cf - -C %s -p --files-from - --no-recursion | 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 | cmd = 'cd %s; find . -print0 | cpio --null -pdlu %s' % (src, dst) |
99 | src = src + "/*" | ||
100 | cmd = 'cp -afl %s %s' % (src, dst) | ||
101 | check_output(cmd, shell=True, stderr=subprocess.STDOUT) | 99 | check_output(cmd, shell=True, stderr=subprocess.STDOUT) |
102 | else: | 100 | else: |
103 | copytree(src, dst) | 101 | copytree(src, dst) |