wic: use STAGING_DATADIR as a default for bootimg_dir
Default value for bootimg_dir was not set in main wic script unlike the rest of artifacts: kernel_dir, roofts_dir and native_sysroot. Set it to the value of STAGING_DATADIR for consistency and to avoid confusion of wic plugin developers. (From OE-Core rev: afc486b6316f1118c8dcc74a5e217bb217dd1f85) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
b78c564cca
commit
3ea735d390
|
@ -171,8 +171,6 @@ def wic_create_subcommand(args, usage_str):
|
||||||
if options.build_check and not engine.verify_build_env():
|
if options.build_check and not engine.verify_build_env():
|
||||||
raise WicError("Couldn't verify build environment, exiting")
|
raise WicError("Couldn't verify build environment, exiting")
|
||||||
|
|
||||||
bootimg_dir = ""
|
|
||||||
|
|
||||||
if options.debug:
|
if options.debug:
|
||||||
logger.setLevel(logging.DEBUG)
|
logger.setLevel(logging.DEBUG)
|
||||||
|
|
||||||
|
@ -189,6 +187,7 @@ def wic_create_subcommand(args, usage_str):
|
||||||
|
|
||||||
rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", options.image_name)
|
rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", options.image_name)
|
||||||
kernel_dir = get_bitbake_var("DEPLOY_DIR_IMAGE", 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",
|
native_sysroot = get_bitbake_var("RECIPE_SYSROOT_NATIVE",
|
||||||
options.image_name) #, cache=False)
|
options.image_name) #, cache=False)
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in New Issue