aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Looijmans <mike.looijmans@topic.nl>2015-09-11 19:02:44 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-12 23:01:54 +0100
commit7f03dd50de76f0b5c3a10c514e920615ffaa846c (patch)
treebd822af9d5ecfdfe3b86a383e92cc23e26ea9926
parentd3fc696bf1c0c5e9a0d238fb86e58771cfbe9cae (diff)
downloadopenembedded-core-contrib-7f03dd50de76f0b5c3a10c514e920615ffaa846c.tar.gz
openembedded-core-contrib-7f03dd50de76f0b5c3a10c514e920615ffaa846c.tar.bz2
openembedded-core-contrib-7f03dd50de76f0b5c3a10c514e920615ffaa846c.zip
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>
-rw-r--r--meta/lib/oe/image.py2
1 files changed, 1 insertions, 1 deletions
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