summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-27 16:53:13 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-28 23:31:17 +0000
commit1cb245a99762e21a170b6a9beabb07e558424946 (patch)
tree34e161d64d93c216d5de8a114b4207aef62f3c9a
parent71e8c98238d627f9665faee9d7c226b9c07bd256 (diff)
downloadopenembedded-core-contrib-1cb245a99762e21a170b6a9beabb07e558424946.tar.gz
staging: Drop common prefix WORKDIR from manifest files
Manifest files containing the same duplicated prefix are wasteful on space and ultimately this costs build time. Drop the WORKDIR prefix from the manifest files since this small change mounts up a lot. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/staging.bbclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 1fe60ac2cb4..1b618fbc50e 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -360,6 +360,7 @@ python extend_recipe_sysroot() {
taskdepdata = d.getVar("BB_TASKDEPDATA", False)
mytaskname = d.getVar("BB_RUNTASK")
+ workdir = d.getVar("WORKDIR")
#bb.warn(str(taskdepdata))
pn = d.getVar("PN")
@@ -504,7 +505,7 @@ python extend_recipe_sysroot() {
continue
else:
bb.note("%s exists in sysroot, but is stale (%s vs. %s), removing." % (c, lnk, c + "." + taskhash))
- sstate_clean_manifest(depdir + "/" + lnk, d)
+ sstate_clean_manifest(depdir + "/" + lnk, d, workdir)
os.unlink(depdir + "/" + c)
elif os.path.lexists(depdir + "/" + c):
os.unlink(depdir + "/" + c)
@@ -559,7 +560,7 @@ python extend_recipe_sysroot() {
else:
dest = staging_copyfile(l, destsysroot, fixme[''], postinsts, stagingdir)
if dest:
- m.write(dest + "\n")
+ m.write(dest.replace(workdir + "/", "") + "\n")
for f in fixme:
if f == '':