summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/image.bbclass8
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
538MULTILIBRE_ALLOW_REP =. "${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|${sysconfdir}|${nonarch_base_libdir}/udev|/lib/modules/[^/]*/modules.*|" 540MULTILIBRE_ALLOW_REP =. "${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|${sysconfdir}|${nonarch_base_libdir}/udev|/lib/modules/[^/]*/modules.*|"