summaryrefslogtreecommitdiffstats
path: root/meta/classes/image.bbclass
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2019-07-09 09:25:09 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-10 09:56:22 +0100
commitecd8dad98f7f4f3d282a8f2d208864fa1944aa8f (patch)
treec7eab86aa6d53a208ec6392784f3622dd76b3c3a /meta/classes/image.bbclass
parent721f09d4897425c7131470bd756eee1b90937feb (diff)
downloadpoky-ecd8dad98f7f4f3d282a8f2d208864fa1944aa8f.tar.gz
image.bbclass: Only append to IMAGE_LINK_NAME if it was already set
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. (From OE-Core rev: e529c45f29bd9a1de21f31fef7acb23eb6e8ebdd) Signed-off-by: Mike Crowe <mac@mcrowe.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r--meta/classes/image.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 7daa97effb..682858dc95 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -328,7 +328,8 @@ addtask do_image_qa_setscene
328 328
329def setup_debugfs_variables(d): 329def setup_debugfs_variables(d):
330 d.appendVar('IMAGE_ROOTFS', '-dbg') 330 d.appendVar('IMAGE_ROOTFS', '-dbg')
331 d.appendVar('IMAGE_LINK_NAME', '-dbg') 331 if d.getVar('IMAGE_LINK_NAME'):
332 d.appendVar('IMAGE_LINK_NAME', '-dbg')
332 d.appendVar('IMAGE_NAME','-dbg') 333 d.appendVar('IMAGE_NAME','-dbg')
333 d.setVar('IMAGE_BUILDING_DEBUGFS', 'true') 334 d.setVar('IMAGE_BUILDING_DEBUGFS', 'true')
334 debugfs_image_fstypes = d.getVar('IMAGE_FSTYPES_DEBUGFS') 335 debugfs_image_fstypes = d.getVar('IMAGE_FSTYPES_DEBUGFS')