diff options
-rw-r--r-- | meta/classes/staging.bbclass | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index eb06f398ac..a774088393 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass | |||
@@ -416,8 +416,8 @@ python extend_recipe_sysroot() { | |||
416 | for l in f: | 416 | for l in f: |
417 | l = l.strip() | 417 | l = l.strip() |
418 | if l not in installed: | 418 | if l not in installed: |
419 | l = depdir + "/" + l | 419 | fl = depdir + "/" + l |
420 | if not os.path.exists(l): | 420 | if not os.path.exists(fl): |
421 | # Was likely already uninstalled | 421 | # Was likely already uninstalled |
422 | continue | 422 | continue |
423 | potential.append(l) | 423 | potential.append(l) |
@@ -433,11 +433,12 @@ python extend_recipe_sysroot() { | |||
433 | if l in potential: | 433 | if l in potential: |
434 | potential.remove(l) | 434 | potential.remove(l) |
435 | for l in potential: | 435 | for l in potential: |
436 | fl = depdir + "/" + l | ||
436 | bb.note("Task %s no longer depends on %s, removing from sysroot" % (mytaskname, l)) | 437 | bb.note("Task %s no longer depends on %s, removing from sysroot" % (mytaskname, l)) |
437 | lnk = os.readlink(l) | 438 | lnk = os.readlink(fl) |
438 | sstate_clean_manifest(depdir + "/" + lnk, d, workdir) | 439 | sstate_clean_manifest(depdir + "/" + lnk, d, workdir) |
439 | os.unlink(l) | 440 | os.unlink(fl) |
440 | os.unlink(l + ".complete") | 441 | os.unlink(fl + ".complete") |
441 | 442 | ||
442 | for dep in configuredeps: | 443 | for dep in configuredeps: |
443 | c = setscenedeps[dep][0] | 444 | c = setscenedeps[dep][0] |