From bf19a8617d05f17506dcb7154e19e2aa2b61838b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 11 Oct 2013 23:02:27 +0100 Subject: [PATCH] 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 rev: 69c26e795c117aabfaf313abbfd10e70ede633d9) Signed-off-by: Richard Purdie --- meta/lib/oe/path.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py index da044ba8c8..1310e38fe1 100644 --- a/meta/lib/oe/path.py +++ b/meta/lib/oe/path.py @@ -81,7 +81,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 -ps . | tar -xf - -C %s' % (src, dst) + cmd = 'tar -cf - -C %s -p . | tar -xf - -C %s' % (src, dst) check_output(cmd, shell=True, stderr=subprocess.STDOUT) def copyhardlinktree(src, dst): @@ -93,7 +93,7 @@ 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 -ps --files-from - | tar -xf - -C %s' % (src, src, dst) + cmd = 'cd %s; find . -type d -print | tar -cf - -C %s -p --files-from - | tar -xf - -C %s' % (src, src, dst) check_output(cmd, shell=True, stderr=subprocess.STDOUT) if os.path.isdir(src): src = src + "/*"