]> code.ossystems Code Review - openembedded-core.git/commitdiff
image.bbclass: Only append to IMAGE_LINK_NAME if it was already set
authorMike Crowe <mac@mcrowe.com>
Tue, 9 Jul 2019 08:25:09 +0000 (09:25 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 10 Jul 2019 08:55:45 +0000 (09:55 +0100)
create_symlinks does not create any links if IMAGE_LINK_NAME is empty.
Unfortunately, setup_debugfs_variables unconditionally appends '-dbg' which
results in a previously-empty IMAGE_LINK_NAME containing just '-dbg'. Let's
check that it's not empty before appending.

Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/image.bbclass

index 7daa97effb2f244260d48490bf673898ffcf64e7..682858dc957329d57851131fa67f4037b841ba64 100644 (file)
@@ -328,7 +328,8 @@ addtask do_image_qa_setscene
 
 def setup_debugfs_variables(d):
     d.appendVar('IMAGE_ROOTFS', '-dbg')
-    d.appendVar('IMAGE_LINK_NAME', '-dbg')
+    if d.getVar('IMAGE_LINK_NAME'):
+        d.appendVar('IMAGE_LINK_NAME', '-dbg')
     d.appendVar('IMAGE_NAME','-dbg')
     d.setVar('IMAGE_BUILDING_DEBUGFS', 'true')
     debugfs_image_fstypes = d.getVar('IMAGE_FSTYPES_DEBUGFS')