diff options
author | Patrick Ohly <patrick.ohly@intel.com> | 2016-05-18 19:24:16 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-22 16:11:14 +0100 |
commit | 1974624eb98d090556b23ece45271e1225c68031 (patch) | |
tree | 966c4924678123bee297beff526bb9bd73aea356 | |
parent | e7b5bd2ba11118f8220b915a44bfff7c9c39ca95 (diff) | |
download | poky-1974624eb98d090556b23ece45271e1225c68031.tar.gz |
image.bbclass: additional output in create_symlinks
When a symlink does not get created, it is useful for debugging to log
what would have been created and why it was skipped.
(From OE-Core rev: d2b4da7d21ce5295442bd2d5c760e64cf843aabb)
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/image.bbclass | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 0e81b4e7e0..9f4c83ffc6 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -523,9 +523,9 @@ python create_symlinks() { | |||
523 | if not link_name: | 523 | if not link_name: |
524 | return | 524 | return |
525 | for type in subimages: | 525 | for type in subimages: |
526 | if os.path.exists(img_name + imgsuffix + type): | 526 | dst = deploy_dir + "/" + link_name + "." + type |
527 | dst = deploy_dir + "/" + link_name + "." + type | 527 | src = img_name + imgsuffix + type |
528 | src = img_name + imgsuffix + type | 528 | if os.path.exists(src): |
529 | bb.note("Creating symlink: %s -> %s" % (dst, src)) | 529 | bb.note("Creating symlink: %s -> %s" % (dst, src)) |
530 | if os.path.islink(dst): | 530 | if os.path.islink(dst): |
531 | if d.getVar('RM_OLD_IMAGE', True) == "1" and \ | 531 | if d.getVar('RM_OLD_IMAGE', True) == "1" and \ |
@@ -533,6 +533,8 @@ python create_symlinks() { | |||
533 | os.remove(os.path.realpath(dst)) | 533 | os.remove(os.path.realpath(dst)) |
534 | os.remove(dst) | 534 | os.remove(dst) |
535 | os.symlink(src, dst) | 535 | os.symlink(src, dst) |
536 | else: | ||
537 | bb.note("Skipping symlink, source does not exist: %s -> %s" % (dst, src)) | ||
536 | } | 538 | } |
537 | 539 | ||
538 | MULTILIBRE_ALLOW_REP =. "${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|${sysconfdir}|${nonarch_base_libdir}/udev|/lib/modules/[^/]*/modules.*|" | 540 | MULTILIBRE_ALLOW_REP =. "${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|${sysconfdir}|${nonarch_base_libdir}/udev|/lib/modules/[^/]*/modules.*|" |