diff options
Diffstat (limited to 'meta/classes/staging.bbclass')
-rw-r--r-- | meta/classes/staging.bbclass | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 6185aefecd..ea831e0167 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass | |||
@@ -373,7 +373,8 @@ python extend_recipe_sysroot() { | |||
373 | msgbuf.append("Following dependency on %s" % setscenedeps[datadep][0]) | 373 | msgbuf.append("Following dependency on %s" % setscenedeps[datadep][0]) |
374 | next = new | 374 | next = new |
375 | 375 | ||
376 | bb.note("\n".join(msgbuf)) | 376 | # This logging is too verbose for day to day use sadly |
377 | #bb.debug(2, "\n".join(msgbuf)) | ||
377 | 378 | ||
378 | depdir = recipesysrootnative + "/installeddeps" | 379 | depdir = recipesysrootnative + "/installeddeps" |
379 | bb.utils.mkdirhier(depdir) | 380 | bb.utils.mkdirhier(depdir) |
@@ -442,6 +443,8 @@ python extend_recipe_sysroot() { | |||
442 | os.unlink(fl) | 443 | os.unlink(fl) |
443 | os.unlink(fl + ".complete") | 444 | os.unlink(fl + ".complete") |
444 | 445 | ||
446 | msg_exists = [] | ||
447 | msg_adding = [] | ||
445 | for dep in configuredeps: | 448 | for dep in configuredeps: |
446 | c = setscenedeps[dep][0] | 449 | c = setscenedeps[dep][0] |
447 | if c not in installed: | 450 | if c not in installed: |
@@ -452,7 +455,7 @@ python extend_recipe_sysroot() { | |||
452 | if os.path.exists(depdir + "/" + c): | 455 | if os.path.exists(depdir + "/" + c): |
453 | lnk = os.readlink(depdir + "/" + c) | 456 | lnk = os.readlink(depdir + "/" + c) |
454 | if lnk == c + "." + taskhash and os.path.exists(depdir + "/" + c + ".complete"): | 457 | if lnk == c + "." + taskhash and os.path.exists(depdir + "/" + c + ".complete"): |
455 | bb.note("%s exists in sysroot, skipping" % c) | 458 | msg_exists.append(c) |
456 | continue | 459 | continue |
457 | else: | 460 | else: |
458 | bb.note("%s exists in sysroot, but is stale (%s vs. %s), removing." % (c, lnk, c + "." + taskhash)) | 461 | bb.note("%s exists in sysroot, but is stale (%s vs. %s), removing." % (c, lnk, c + "." + taskhash)) |
@@ -463,6 +466,8 @@ python extend_recipe_sysroot() { | |||
463 | elif os.path.lexists(depdir + "/" + c): | 466 | elif os.path.lexists(depdir + "/" + c): |
464 | os.unlink(depdir + "/" + c) | 467 | os.unlink(depdir + "/" + c) |
465 | 468 | ||
469 | msg_adding.append(c) | ||
470 | |||
466 | os.symlink(c + "." + taskhash, depdir + "/" + c) | 471 | os.symlink(c + "." + taskhash, depdir + "/" + c) |
467 | 472 | ||
468 | d2 = d | 473 | d2 = d |
@@ -559,6 +564,9 @@ python extend_recipe_sysroot() { | |||
559 | continue | 564 | continue |
560 | staging_copyfile(l, targetdir, dest, postinsts, seendirs) | 565 | staging_copyfile(l, targetdir, dest, postinsts, seendirs) |
561 | 566 | ||
567 | bb.note("Installed into sysroot: %s" % str(msg_adding)) | ||
568 | bb.note("Skipping as already exists in sysroot: %s" % str(msg_exists)) | ||
569 | |||
562 | for f in fixme: | 570 | for f in fixme: |
563 | if f == '': | 571 | if f == '': |
564 | staging_processfixme(fixme[f], recipesysroot, recipesysroot, recipesysrootnative, d) | 572 | staging_processfixme(fixme[f], recipesysroot, recipesysroot, recipesysrootnative, d) |