diff options
Diffstat (limited to 'scripts/wic')
-rwxr-xr-x | scripts/wic | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/scripts/wic b/scripts/wic index a741aed364..06e0b48db0 100755 --- a/scripts/wic +++ b/scripts/wic | |||
@@ -22,9 +22,9 @@ import sys | |||
22 | import argparse | 22 | import argparse |
23 | import logging | 23 | import logging |
24 | import subprocess | 24 | import subprocess |
25 | import shutil | ||
25 | 26 | ||
26 | from collections import namedtuple | 27 | from collections import namedtuple |
27 | from distutils import spawn | ||
28 | 28 | ||
29 | # External modules | 29 | # External modules |
30 | scripts_path = os.path.dirname(os.path.realpath(__file__)) | 30 | scripts_path = os.path.dirname(os.path.realpath(__file__)) |
@@ -47,7 +47,7 @@ if os.environ.get('SDKTARGETSYSROOT'): | |||
47 | break | 47 | break |
48 | sdkroot = os.path.dirname(sdkroot) | 48 | sdkroot = os.path.dirname(sdkroot) |
49 | 49 | ||
50 | bitbake_exe = spawn.find_executable('bitbake') | 50 | bitbake_exe = shutil.which('bitbake') |
51 | if bitbake_exe: | 51 | if bitbake_exe: |
52 | bitbake_path = scriptpath.add_bitbake_lib_path() | 52 | bitbake_path = scriptpath.add_bitbake_lib_path() |
53 | import bb | 53 | import bb |
@@ -159,6 +159,9 @@ def wic_create_subcommand(options, usage_str): | |||
159 | "(Use -e/--image-name to specify it)") | 159 | "(Use -e/--image-name to specify it)") |
160 | native_sysroot = options.native_sysroot | 160 | native_sysroot = options.native_sysroot |
161 | 161 | ||
162 | if options.kernel_dir: | ||
163 | kernel_dir = options.kernel_dir | ||
164 | |||
162 | if not options.vars_dir and (not native_sysroot or not os.path.isdir(native_sysroot)): | 165 | if not options.vars_dir and (not native_sysroot or not os.path.isdir(native_sysroot)): |
163 | logger.info("Building wic-tools...\n") | 166 | logger.info("Building wic-tools...\n") |
164 | subprocess.check_call(["bitbake", "wic-tools"]) | 167 | subprocess.check_call(["bitbake", "wic-tools"]) |
@@ -206,7 +209,7 @@ def wic_create_subcommand(options, usage_str): | |||
206 | logger.info(" (Please check that the build artifacts for the machine") | 209 | logger.info(" (Please check that the build artifacts for the machine") |
207 | logger.info(" selected in local.conf actually exist and that they") | 210 | logger.info(" selected in local.conf actually exist and that they") |
208 | logger.info(" are the correct artifacts for the image (.wks file)).\n") | 211 | logger.info(" are the correct artifacts for the image (.wks file)).\n") |
209 | raise WicError("The artifact that couldn't be found was %s:\n %s", not_found, not_found_dir) | 212 | raise WicError("The artifact that couldn't be found was %s:\n %s" % (not_found, not_found_dir)) |
210 | 213 | ||
211 | krootfs_dir = options.rootfs_dir | 214 | krootfs_dir = options.rootfs_dir |
212 | if krootfs_dir is None: | 215 | if krootfs_dir is None: |
@@ -346,6 +349,8 @@ def wic_init_parser_create(subparser): | |||
346 | default=False, help="output debug information") | 349 | default=False, help="output debug information") |
347 | subparser.add_argument("-i", "--imager", dest="imager", | 350 | subparser.add_argument("-i", "--imager", dest="imager", |
348 | default="direct", help="the wic imager plugin") | 351 | default="direct", help="the wic imager plugin") |
352 | subparser.add_argument("--extra-space", type=int, dest="extra_space", | ||
353 | default=0, help="additional free disk space to add to the image") | ||
349 | return | 354 | return |
350 | 355 | ||
351 | 356 | ||