From 522ac21831944b06fbcc372ac61762576d792c22 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Fri, 14 Jul 2017 15:33:02 +0300 Subject: 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 Signed-off-by: Ross Burton --- scripts/wic | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts/wic') 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 -- cgit 1.2.3-korg