Re: [PATCH 2/2] oe.path: preserve xattr in copytree() and copyhardlinktree()

Mark Hatle
2016-08-26T15:48:58Z

On 8/26/16 10:43 AM, Joshua Lock wrote:
> 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.
>
> [YOCTO #9857]
>
> Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
> ---
> meta/lib/oe/path.py | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py
> index 3c07df3..631c3b4 100644
> --- a/meta/lib/oe/path.py
> +++ b/meta/lib/oe/path.py
> @@ -65,7 +65,7 @@ def copytree(src, dst):
> # This way we also preserve hardlinks between files in the tree.
>
> 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)
>
> def copyhardlinktree(src, dst):
> @@ -77,9 +77,14 @@ def copyhardlinktree(src, dst):
> 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
> # 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)
> - cmd = 'cd %s; find . -print0 | cpio --null -pdlu %s' % (src, dst)

The reason why cpio was originally used had to do with filenames that had spaces
or other special characters in them. (this is why the -print0 was used)

I don't object to the change, but we need to make sure that that will still work
properly.

(Also I thought CPIO -could- do xattrs in the current versions...)

--Mark

> + 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)
> else:
> copytree(src, dst)
>