summaryrefslogtreecommitdiffstats
path: root/scripts/wic
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-01-19 16:01:34 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-23 12:03:52 +0000
commit0d005d099a2b8ee1303b98710cdc78e06e14ab39 (patch)
treefd37f7f7653211a6397db74190c308502b93c9fd /scripts/wic
parente4269fdb4c3ef06b97df063f8586f74986215c83 (diff)
downloadopenembedded-core-contrib-0d005d099a2b8ee1303b98710cdc78e06e14ab39.tar.gz
openembedded-core-contrib-0d005d099a2b8ee1303b98710cdc78e06e14ab39.tar.bz2
openembedded-core-contrib-0d005d099a2b8ee1303b98710cdc78e06e14ab39.zip
wic: rebuild wic-tools if its sysroot doesn't exist
Rebuild wic-tools if its native sysroot doesn't exist to ensure that all required tools are available. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Diffstat (limited to 'scripts/wic')
-rwxr-xr-xscripts/wic14
1 files changed, 13 insertions, 1 deletions
diff --git a/scripts/wic b/scripts/wic
index f09dbc2e00..8918cb4853 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -175,11 +175,23 @@ def wic_create_subcommand(args, usage_str):
rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", options.image_name)
kernel_dir = get_bitbake_var("DEPLOY_DIR_IMAGE", options.image_name)
- native_sysroot = os.path.join(get_bitbake_var("RECIPE_SYSROOT_NATIVE", "wic-tools"))
+ native_sysroot = get_bitbake_var("RECIPE_SYSROOT_NATIVE",
+ "wic-tools", cache=False)
else:
if options.build_rootfs:
print("Image name is not specified, exiting. (Use -e/--image-name to specify it)\n")
sys.exit(1)
+ native_sysroot = options.native_sysroot
+
+ if not native_sysroot or not os.path.isdir(native_sysroot):
+ print("Building wic-tools...\n")
+ if bitbake_main(BitBakeConfigParameters("bitbake wic-tools".split()),
+ cookerdata.CookerConfiguration()):
+ sys.exit(1)
+ native_sysroot = get_bitbake_var("RECIPE_SYSROOT_NATIVE", "wic-tools")
+ if not native_sysroot:
+ print("Unable to find the location of the native tools sysroot to use\n")
+ sys.exit(1)
wks_file = args[0]