diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-08-30 20:47:03 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-30 21:38:22 +0100 |
commit | d80ad239e338f025a30ba2910bf58800761f234d (patch) | |
tree | 4fecd5d8742e39ddbc8d0e0d8e1f0a754a10864d | |
parent | 95c6749af872a92849cae6f8bbf38c8ba76443ae (diff) | |
download | poky-d80ad239e338f025a30ba2910bf58800761f234d.tar.gz |
wic: set default image
Set BitbakeVars.default_image when wic is called with -e option.
This makes get_bitbake_var API to use provided image as a default
source of variables.
(From OE-Core rev: d465233579d5efa2e0578baac67f42a35ad8b993)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | scripts/wic | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/wic b/scripts/wic index 5aa2393cf9..5818e2da2e 100755 --- a/scripts/wic +++ b/scripts/wic | |||
@@ -52,7 +52,7 @@ if bitbake_exe: | |||
52 | else: | 52 | else: |
53 | bitbake_main = None | 53 | bitbake_main = None |
54 | 54 | ||
55 | from wic.utils.oe.misc import get_bitbake_var | 55 | from wic.utils.oe.misc import get_bitbake_var, BB_VARS |
56 | from wic.utils.errors import WicError | 56 | from wic.utils.errors import WicError |
57 | from image import engine | 57 | from image import engine |
58 | from image import help as hlp | 58 | from image import help as hlp |
@@ -141,7 +141,9 @@ def wic_create_subcommand(args, usage_str): | |||
141 | print " " + ", ".join(missed) | 141 | print " " + ", ".join(missed) |
142 | sys.exit(1) | 142 | sys.exit(1) |
143 | 143 | ||
144 | if not options.image_name: | 144 | if options.image_name: |
145 | BB_VARS.default_image = options.image_name | ||
146 | else: | ||
145 | options.build_check = False | 147 | options.build_check = False |
146 | 148 | ||
147 | if options.build_check: | 149 | if options.build_check: |