diff options
author | Mike Looijmans <mike.looijmans@topic.nl> | 2015-09-11 19:02:44 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-14 20:46:35 +0100 |
commit | 722aa22d157f27025a5e78d0c8db16769cb9cf8b (patch) | |
tree | 8783e44d8fc0640fdcd4acacbaa9398bc010211d /meta | |
parent | 3006cb260004a7bd88cfd4ea3e2cbcac600347bc (diff) | |
download | poky-722aa22d157f27025a5e78d0c8db16769cb9cf8b.tar.gz |
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.
(From OE-Core rev: 7f03dd50de76f0b5c3a10c514e920615ffaa846c)
Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oe/image.py | 2 |
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): | |||
194 | 194 | ||
195 | os.chdir(deploy_dir) | 195 | os.chdir(deploy_dir) |
196 | 196 | ||
197 | if link_name is not None: | 197 | if link_name: |
198 | for type in subimages: | 198 | for type in subimages: |
199 | if os.path.exists(img_name + ".rootfs." + type): | 199 | if os.path.exists(img_name + ".rootfs." + type): |
200 | dst = link_name + "." + type | 200 | dst = link_name + "." + type |