aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-03-22 15:42:29 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-22 15:07:37 +0000
commitafc486b6316f1118c8dcc74a5e217bb217dd1f85 (patch)
tree2c5e0c17efd7da5ddfd185b0f607e898f93f467d
parent567186f995302a095a771baede4ff5034d1d1862 (diff)
downloadopenembedded-core-contrib-afc486b6316f1118c8dcc74a5e217bb217dd1f85.tar.gz
openembedded-core-contrib-afc486b6316f1118c8dcc74a5e217bb217dd1f85.tar.bz2
openembedded-core-contrib-afc486b6316f1118c8dcc74a5e217bb217dd1f85.zip
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. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/wic3
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/wic b/scripts/wic
index 99721dcc331..8e9c05c18c4 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -171,8 +171,6 @@ def wic_create_subcommand(args, usage_str):
if options.build_check and not engine.verify_build_env():
raise WicError("Couldn't verify build environment, exiting")
- bootimg_dir = ""
-
if options.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)
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)
else: