summaryrefslogtreecommitdiffstats
path: root/scripts/wic
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-07-14 15:33:02 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-17 13:48:54 +0100
commit522ac21831944b06fbcc372ac61762576d792c22 (patch)
treeee82daf216921410e7f50ea6f087e234e27432b9 /scripts/wic
parentfc12ce9d1b92cc0104cf456af1e3d5f146b9219d (diff)
downloadopenembedded-core-contrib-522ac21831944b06fbcc372ac61762576d792c22.tar.gz
openembedded-core-contrib-522ac21831944b06fbcc372ac61762576d792c22.tar.bz2
openembedded-core-contrib-522ac21831944b06fbcc372ac61762576d792c22.zip
wic: build wic-tools only if wic is run manually
When wic can't find native sysroot it tries to build wic-tools However, it's not possible when wic is run from bitbake. Moreover, it's not even feasible anymore as wic-tools should be used only when wic is run manually. Checked if wic is run manually before building wic-tools. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts/wic')
-rwxr-xr-xscripts/wic8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/wic b/scripts/wic
index b8d2a866e1..02bc82ce42 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -164,15 +164,15 @@ def wic_create_subcommand(options, usage_str):
"(Use -e/--image-name to specify it)")
native_sysroot = options.native_sysroot
- if not native_sysroot or not os.path.isdir(native_sysroot):
+ if not options.vars_dir and (not native_sysroot or not os.path.isdir(native_sysroot)):
logger.info("Building wic-tools...\n")
if bitbake_main(BitBakeConfigParameters("bitbake wic-tools".split()),
cookerdata.CookerConfiguration()):
raise WicError("bitbake wic-tools failed")
native_sysroot = get_bitbake_var("RECIPE_SYSROOT_NATIVE", "wic-tools")
- if not native_sysroot:
- raise WicError("Unable to find the location of the native "
- "tools sysroot to use")
+
+ if not native_sysroot:
+ raise WicError("Unable to find the location of the native tools sysroot")
wks_file = options.wks_file