summaryrefslogtreecommitdiffstats
path: root/scripts/lib
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 14:01:37 +0100
commitb6dd87f2a85300c1f621b4195e3f0357091bec33 (patch)
tree7ad7d48e1d99ce8bd91845f3efa727e066404e67 /scripts/lib
parent223d3b44c08c3522ef7c1d2f67f170e819b27c99 (diff)
downloadpoky-b6dd87f2a85300c1f621b4195e3f0357091bec33.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] (From OE-Core rev: 33ca15b94dbe7204c556c4b5526edd529f6d85f4) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/wic/misc.py9
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-pcbios.py5
-rw-r--r--scripts/lib/wic/plugins/source/isoimage-isohybrid.py4
3 files changed, 7 insertions, 11 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=""):
139 if pseudo: 139 if pseudo:
140 cmd_and_args = pseudo + cmd_and_args 140 cmd_and_args = pseudo + cmd_and_args
141 141
142 wtools_sysroot = get_bitbake_var("RECIPE_SYSROOT_NATIVE", "wic-tools") 142 native_paths = "%s/sbin:%s/usr/sbin:%s/usr/bin" % \
143 (native_sysroot, native_sysroot, native_sysroot)
143 144
144 native_paths = \
145 "%s/sbin:%s/usr/sbin:%s/usr/bin:%s/sbin:%s/usr/sbin:%s/usr/bin" % \
146 (wtools_sysroot, wtools_sysroot, wtools_sysroot,
147 native_sysroot, native_sysroot, native_sysroot)
148 native_cmd_and_args = "export PATH=%s:$PATH;%s" % \ 145 native_cmd_and_args = "export PATH=%s:$PATH;%s" % \
149 (native_paths, cmd_and_args) 146 (native_paths, cmd_and_args)
150 logger.debug("exec_native_cmd: %s", native_cmd_and_args) 147 logger.debug("exec_native_cmd: %s", native_cmd_and_args)
151 148
152 # If the command isn't in the native sysroot say we failed. 149 # If the command isn't in the native sysroot say we failed.
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index e3518d2f0b..56da468fb5 100644
--- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -45,10 +45,9 @@ class BootimgPcbiosPlugin(SourcePlugin):
45 @classmethod 45 @classmethod
46 def _get_bootimg_dir(cls, bootimg_dir, dirname): 46 def _get_bootimg_dir(cls, bootimg_dir, dirname):
47 """ 47 """
48 Check if dirname exists in default bootimg_dir or 48 Check if dirname exists in default bootimg_dir or in STAGING_DIR.
49 in wic-tools STAGING_DIR.
50 """ 49 """
51 for result in (bootimg_dir, get_bitbake_var("STAGING_DATADIR", "wic-tools")): 50 for result in (bootimg_dir, get_bitbake_var("STAGING_DATADIR")):
52 if os.path.exists("%s/%s" % (result, dirname)): 51 if os.path.exists("%s/%s" % (result, dirname)):
53 return result 52 return result
54 53
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index db77113232..85f35f7fbe 100644
--- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
@@ -342,7 +342,7 @@ class IsoImagePlugin(SourcePlugin):
342 342
343 if not os.path.isfile("%s/EFI/BOOT/%s" \ 343 if not os.path.isfile("%s/EFI/BOOT/%s" \
344 % (bootimg_dir, grub_image)): 344 % (bootimg_dir, grub_image)):
345 grub_path = get_bitbake_var("STAGING_LIBDIR", "wic-tools") 345 grub_path = get_bitbake_var("STAGING_LIBDIR")
346 if not grub_path: 346 if not grub_path:
347 raise WicError("Couldn't find STAGING_LIBDIR, exiting.") 347 raise WicError("Couldn't find STAGING_LIBDIR, exiting.")
348 348
@@ -411,7 +411,7 @@ class IsoImagePlugin(SourcePlugin):
411 exec_cmd(chmod_cmd) 411 exec_cmd(chmod_cmd)
412 412
413 # Prepare files for legacy boot 413 # Prepare files for legacy boot
414 syslinux_dir = get_bitbake_var("STAGING_DATADIR", "wic-tools") 414 syslinux_dir = get_bitbake_var("STAGING_DATADIR")
415 if not syslinux_dir: 415 if not syslinux_dir:
416 raise WicError("Couldn't find STAGING_DATADIR, exiting.") 416 raise WicError("Couldn't find STAGING_DATADIR, exiting.")
417 417