diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-03 17:34:54 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-06 13:12:59 +0000 |
| commit | dd61d225843346f2c4500a54a609e63394f4cc35 (patch) | |
| tree | dca2c837bdac2c18e7d7b4a47c9b1eb447040117 | |
| parent | 6c7d6d6c8a35568c7e7db6e32fa86825bd2cda65 (diff) | |
| download | ast2050-yocto-poky-dd61d225843346f2c4500a54a609e63394f4cc35.zip ast2050-yocto-poky-dd61d225843346f2c4500a54a609e63394f4cc35.tar.gz | |
sstate/path.py: Add copyhardlinktree() function and use for performance optimisation
Add a function which copys a tree as a set of hardlinks to the original
files, then use this in sstate to reduce some of the overhead of sstate
package creation since the file isn't actually copied.
(From OE-Core rev: 8e373e69acac853213a62afb8bbdf0adc0c5045a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/sstate.bbclass | 4 | ||||
| -rw-r--r-- | meta/lib/oe/path.py | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index a79d2b5..6f77bb9 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -458,14 +458,14 @@ def sstate_package(ss, d): dstpath = srcpath.replace(state[1], sstatebuild + state[0]) make_relative_symlink(srcpath, dstpath, d) bb.debug(2, "Preparing tree %s for packaging at %s" % (state[1], sstatebuild + state[0])) - oe.path.copytree(state[1], sstatebuild + state[0]) + oe.path.copyhardlinktree(state[1], sstatebuild + state[0]) workdir = d.getVar('WORKDIR', True) for plain in ss['plaindirs']: pdir = plain.replace(workdir, sstatebuild) bb.mkdirhier(plain) bb.mkdirhier(pdir) - oe.path.copytree(plain, pdir) + oe.path.copyhardlinktree(plain, pdir) d.setVar('SSTATE_BUILDDIR', sstatebuild) d.setVar('SSTATE_PKG', sstatepkg) diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py index 7197b23..ea58bed 100644 --- a/meta/lib/oe/path.py +++ b/meta/lib/oe/path.py @@ -83,6 +83,14 @@ def copytree(src, dst): cmd = 'tar -cf - -C %s -ps . | tar -xf - -C %s' % (src, dst) check_output(cmd, shell=True, stderr=subprocess.STDOUT) +def copyhardlinktree(src, dst): + bb.utils.mkdirhier(dst) + if os.path.isdir(src): + if not len(os.listdir(src)): + return + src = src + "/*" + cmd = 'cp -al %s %s' % (src, dst) + check_output(cmd, shell=True, stderr=subprocess.STDOUT) def remove(path, recurse=True): """Equivalent to rm -f or rm -rf""" |
