[OE-core] [PATCH 5/7] staging: Drop common prefix WORKDIR from manifest files

[Richard Purdie]

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 at linuxfoundation.org>
---
 meta/classes/staging.bbclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 1fe60ac..1b618fb 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 == '':
-- 
2.7.4