[oe-commits] [openembedded-core] 07/26: image.bbclass: Only append to IMAGE_LINK_NAME if it was already set

git at git.openembedded.org git at git.openembedded.org
Tue Jul 9 22:37:11 UTC 2019

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit adbb345ac71480c1d17999881c4e3d81af9c4650
Author: Mike Crowe <mac at mcrowe.com>
AuthorDate: Tue Jul 9 09:25:09 2019 +0100

    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.
    Signed-off-by: Mike Crowe <mac at mcrowe.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
 meta/classes/image.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 7daa97e..682858d 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -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.setVar('IMAGE_BUILDING_DEBUGFS', 'true')
     debugfs_image_fstypes = d.getVar('IMAGE_FSTYPES_DEBUGFS')

To stop receiving notification emails like this one, please contact
the administrator of this repository.

More information about the Openembedded-commits mailing list