[oe-commits] Robert Yang : sstate.bbclass: make hard links for staging files
git at git.openembedded.org
git at git.openembedded.org
Thu May 2 16:38:10 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: 5853e0f482b22258c909268fe71673a29e31989b
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5853e0f482b22258c909268fe71673a29e31989b
Author: Robert Yang <liezhi.yang at windriver.com>
Date: Sat Apr 27 05:32:07 2013 -0400
sstate.bbclass: make hard links for staging files
Make hard links for staging files instead of copy to save the disk space
(3G will be saved for a core-image-sato build), and it doesn't affect
much on the build time.
The following directories are affected:
1) The sysroot
2) The DEPLOY_DIR
3) The pkgdata
[YOCTO #4372]
Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/classes/sstate.bbclass | 2 +-
meta/lib/oe/path.py | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 79d3830..77ec402 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -198,7 +198,7 @@ def sstate_install(ss, d):
# Run the actual file install
for state in ss['dirs']:
if os.path.exists(state[1]):
- oe.path.copytree(state[1], state[2])
+ oe.path.copyhardlinktree(state[1], state[2])
for postinst in (d.getVar('SSTATEPOSTINSTFUNCS', True) or '').split():
bb.build.exec_func(postinst, d)
diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py
index faa0f61..4f8b66c 100644
--- a/meta/lib/oe/path.py
+++ b/meta/lib/oe/path.py
@@ -85,13 +85,18 @@ def copytree(src, dst):
check_output(cmd, shell=True, stderr=subprocess.STDOUT)
def copyhardlinktree(src, dst):
+ """ Make the hard link when possible, otherwise copy. """
bb.utils.mkdirhier(dst)
+ src_bak = src
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)
+ if (os.stat(src_bak).st_dev == os.stat(dst).st_dev):
+ cmd = 'cp -afl %s %s' % (src, dst)
+ check_output(cmd, shell=True, stderr=subprocess.STDOUT)
+ else:
+ copytree(src_bak, dst)
def remove(path, recurse=True):
"""Equivalent to rm -f or rm -rf"""
More information about the Openembedded-commits
mailing list