From: Richard Purdie Date: Fri, 8 Nov 2013 22:13:38 +0000 (+0000) Subject: lib/oe/path: Fixup handling of .* files in top level paths for copyhardlinktree() X-Git-Tag: rev_ivi_2015_02_04~10437 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c9e7896a3f3eff72c8d259db683ba862a8ded835;p=scm%2Fbb%2Ftizen-distro.git 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 --- diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py index d0588ba..46783f8 100644 --- a/meta/lib/oe/path.py +++ b/meta/lib/oe/path.py @@ -95,9 +95,7 @@ def copyhardlinktree(src, dst): # writers try and create a directory at the same time cmd = 'cd %s; find . -type d -print | tar -cf - -C %s -p --files-from - --no-recursion | tar -xf - -C %s' % (src, src, dst) check_output(cmd, shell=True, stderr=subprocess.STDOUT) - if os.path.isdir(src): - src = src + "/*" - cmd = 'cp -afl %s %s' % (src, dst) + cmd = 'cd %s; find . -print0 | cpio --null -pdlu %s' % (src, dst) check_output(cmd, shell=True, stderr=subprocess.STDOUT) else: copytree(src, dst)