From: Mike Looijmans <mike.looijmans@topic.nl>
Date: Fri, 11 Sep 2015 17:02:44 +0000 (+0200)
Subject: image.py: Allow IMAGE_LINK_NAME to be empty
X-Git-Tag: 2015-10~426
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=7f03dd50de76f0b5c3a10c514e920615ffaa846c;p=openembedded-core.git

image.py: Allow IMAGE_LINK_NAME to be empty

When IMAGE_LINK_NAME is empty, OE will try to create a "blank" link instead
of just skipping it. The code checks for "link_name is not None" which will
never evaluate to true. Change the test to a simple "if link_name:" so it
no longer attempt to create links when the variable is an empty string.

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/lib/oe/image.py b/meta/lib/oe/image.py
index 5b77306065..2361955971 100644
--- a/meta/lib/oe/image.py
+++ b/meta/lib/oe/image.py
@@ -194,7 +194,7 @@ class Image(ImageDepGraph):
 
         os.chdir(deploy_dir)
 
-        if link_name is not None:
+        if link_name:
             for type in subimages:
                 if os.path.exists(img_name + ".rootfs." + type):
                     dst = link_name + "." + type