oe.path: preserve xattr in copytree() and copyhardlinktree()
Pass appropriate options to tar invocations in copytree() and copyhardlinktree() to ensure that any extended attributes on the files are preserved during the copy. We have to drop the use cpio in "Copy-pass" mode in copyhardlinktree() because cpio doesn't support extended attributes on files. Instead we revert back to using cp with different patterns depending on whether or not the directory contains dot files. (From OE-Core rev: e591d69103a40ec4f76d1132a6039d9cb1555103) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
97677c11cf
commit
92f9308e2c
|
@ -65,7 +65,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 -p . | tar -xf - -C %s' % (src, dst)
|
cmd = "tar --xattrs --xattrs-include='*' -cf - -C %s -p . | tar --xattrs --xattrs-include='*' -xf - -C %s" % (src, dst)
|
||||||
subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
|
subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
|
||||||
|
|
||||||
def copyhardlinktree(src, dst):
|
def copyhardlinktree(src, dst):
|
||||||
|
@ -77,9 +77,14 @@ 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 -p --no-recursion --files-from - | tar -xf - -C %s' % (src, src, dst)
|
cmd = "cd %s; find . -type d -print | tar --xattrs --xattrs-include='*' -cf - -C %s -p --no-recursion --files-from - | tar --xattrs --xattrs-include='*' -xf - -C %s" % (src, src, dst)
|
||||||
subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
|
subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
|
||||||
cmd = 'cd %s; find . -print0 | cpio --null -pdlu %s' % (src, dst)
|
if os.path.isdir(src):
|
||||||
|
import glob
|
||||||
|
if len(glob.glob('%s/.??*' % src)) > 0:
|
||||||
|
src = src + '/.??* '
|
||||||
|
src = src + '/*'
|
||||||
|
cmd = 'cp -afl --preserve=xattr %s %s' % (src, dst)
|
||||||
subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
|
subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
|
||||||
else:
|
else:
|
||||||
copytree(src, dst)
|
copytree(src, dst)
|
||||||
|
|
Loading…
Reference in New Issue