summaryrefslogtreecommitdiffstats
path: root/scripts/wic
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-07-14 15:33:00 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-17 13:48:53 +0100
commit33ca15b94dbe7204c556c4b5526edd529f6d85f4 (patch)
tree7caf591df0e98f2d650398c76f6937f914f5a0ae /scripts/wic
parent18b52577484d3b86bc31980a50da04141afda5f9 (diff)
downloadopenembedded-core-contrib-33ca15b94dbe7204c556c4b5526edd529f6d85f4.tar.gz
openembedded-core-contrib-33ca15b94dbe7204c556c4b5526edd529f6d85f4.tar.bz2
openembedded-core-contrib-33ca15b94dbe7204c556c4b5526edd529f6d85f4.zip
wic: get rid of using wic-tools
At the moment, when building images with IMAGE_FSTYPES=wic one ends up depending on wic-tools and thus syslinux and grub-efi even when not using those at all. Ideally, building an image with wic should only build the tools and components really needed. The problem is that "wic-tools" is needed also for the manual invocations of wic, in which case everything that might be needed has to be built in advance. Replaced dependency on wic-tools with dependency to a much shorter set of tools that wic uses almost for any image: 'parted', 'gptfdisk', 'dosfstools' and 'mtools'. [YOCTO #11552] 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/wic6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/wic b/scripts/wic
index 81fc85d693..b8d2a866e1 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -154,8 +154,10 @@ def wic_create_subcommand(options, usage_str):
rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", options.image_name)
kernel_dir = get_bitbake_var("DEPLOY_DIR_IMAGE", options.image_name)
bootimg_dir = get_bitbake_var("STAGING_DATADIR", options.image_name)
- native_sysroot = get_bitbake_var("RECIPE_SYSROOT_NATIVE",
- options.image_name) #, cache=False)
+
+ native_sysroot = options.native_sysroot
+ if options.vars_dir and not native_sysroot:
+ native_sysroot = get_bitbake_var("RECIPE_SYSROOT_NATIVE", options.image_name)
else:
if options.build_rootfs:
raise WicError("Image name is not specified, exiting. "