diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-07-14 15:33:00 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-17 13:48:53 +0100 |
| commit | 33ca15b94dbe7204c556c4b5526edd529f6d85f4 (patch) | |
| tree | 7caf591df0e98f2d650398c76f6937f914f5a0ae /scripts/lib/wic/misc.py | |
| parent | 18b52577484d3b86bc31980a50da04141afda5f9 (diff) | |
| download | openembedded-core-contrib-33ca15b94dbe7204c556c4b5526edd529f6d85f4.tar.gz | |
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/lib/wic/misc.py')
| -rw-r--r-- | scripts/lib/wic/misc.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/scripts/lib/wic/misc.py b/scripts/lib/wic/misc.py index 3ebae0a6e0..4e07cd659c 100644 --- a/scripts/lib/wic/misc.py +++ b/scripts/lib/wic/misc.py @@ -139,14 +139,11 @@ def exec_native_cmd(cmd_and_args, native_sysroot, pseudo=""): if pseudo: cmd_and_args = pseudo + cmd_and_args - wtools_sysroot = get_bitbake_var("RECIPE_SYSROOT_NATIVE", "wic-tools") + native_paths = "%s/sbin:%s/usr/sbin:%s/usr/bin" % \ + (native_sysroot, native_sysroot, native_sysroot) - native_paths = \ - "%s/sbin:%s/usr/sbin:%s/usr/bin:%s/sbin:%s/usr/sbin:%s/usr/bin" % \ - (wtools_sysroot, wtools_sysroot, wtools_sysroot, - native_sysroot, native_sysroot, native_sysroot) native_cmd_and_args = "export PATH=%s:$PATH;%s" % \ - (native_paths, cmd_and_args) + (native_paths, cmd_and_args) logger.debug("exec_native_cmd: %s", native_cmd_and_args) # If the command isn't in the native sysroot say we failed. |