summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-08 15:19:05 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-12 10:34:09 +0000
commit8a07a176d70b8dd1f3a735681e91352cba27bef2 (patch)
tree134435c9471b344e428081ee8841c50bf9f6a610 /meta/lib
parent5e73287ad88837c6fea9d03bb1af81a1f83e89cc (diff)
downloadpoky-8a07a176d70b8dd1f3a735681e91352cba27bef2.tar.gz
lib/oe/path: Fix performance issue got copyhardlinktree()
With the directory copy was added to avoid race issues, it wasn't noticed that tar was recursing the directories and copying files too. This is completely crazy when we hardlink those files in the next command. Resolve the issue by telling tar not to recurse. This gives a significant performance boost to various parts of the system (do_package for linux-yocto 256s -> 178s for example). (From OE-Core rev: 8b90ed084d59b4e07aa547255d327b25cfb2ee2b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/path.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py
index 1310e38fe1..d0588baf15 100644
--- a/meta/lib/oe/path.py
+++ b/meta/lib/oe/path.py
@@ -93,7 +93,7 @@ def copyhardlinktree(src, dst):
93 if (os.stat(src).st_dev == os.stat(dst).st_dev): 93 if (os.stat(src).st_dev == os.stat(dst).st_dev):
94 # Need to copy directories only with tar first since cp will error if two 94 # Need to copy directories only with tar first since cp will error if two
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 - | 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 if os.path.isdir(src):
99 src = src + "/*" 99 src = src + "/*"