diff options
-rw-r--r-- | meta/classes/staging.bbclass | 5 |
1 files changed, 3 insertions, 2 deletions
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() { | |||
360 | 360 | ||
361 | taskdepdata = d.getVar("BB_TASKDEPDATA", False) | 361 | taskdepdata = d.getVar("BB_TASKDEPDATA", False) |
362 | mytaskname = d.getVar("BB_RUNTASK") | 362 | mytaskname = d.getVar("BB_RUNTASK") |
363 | workdir = d.getVar("WORKDIR") | ||
363 | #bb.warn(str(taskdepdata)) | 364 | #bb.warn(str(taskdepdata)) |
364 | pn = d.getVar("PN") | 365 | pn = d.getVar("PN") |
365 | 366 | ||
@@ -504,7 +505,7 @@ python extend_recipe_sysroot() { | |||
504 | continue | 505 | continue |
505 | else: | 506 | else: |
506 | bb.note("%s exists in sysroot, but is stale (%s vs. %s), removing." % (c, lnk, c + "." + taskhash)) | 507 | bb.note("%s exists in sysroot, but is stale (%s vs. %s), removing." % (c, lnk, c + "." + taskhash)) |
507 | sstate_clean_manifest(depdir + "/" + lnk, d) | 508 | sstate_clean_manifest(depdir + "/" + lnk, d, workdir) |
508 | os.unlink(depdir + "/" + c) | 509 | os.unlink(depdir + "/" + c) |
509 | elif os.path.lexists(depdir + "/" + c): | 510 | elif os.path.lexists(depdir + "/" + c): |
510 | os.unlink(depdir + "/" + c) | 511 | os.unlink(depdir + "/" + c) |
@@ -559,7 +560,7 @@ python extend_recipe_sysroot() { | |||
559 | else: | 560 | else: |
560 | dest = staging_copyfile(l, destsysroot, fixme[''], postinsts, stagingdir) | 561 | dest = staging_copyfile(l, destsysroot, fixme[''], postinsts, stagingdir) |
561 | if dest: | 562 | if dest: |
562 | m.write(dest + "\n") | 563 | m.write(dest.replace(workdir + "/", "") + "\n") |
563 | 564 | ||
564 | for f in fixme: | 565 | for f in fixme: |
565 | if f == '': | 566 | if f == '': |