From a4274bcc37cd0984f1aedd1c5a6c5dae8a9e61a2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 27 Jan 2017 16:53:13 +0000 Subject: 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. (From OE-Core rev: 1cb245a99762e21a170b6a9beabb07e558424946) Signed-off-by: Richard Purdie --- meta/classes/staging.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/classes/staging.bbclass') diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 1fe60ac2cb..1b618fbc50 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 == '': -- cgit v1.2.3-54-g00ecf