[oe-commits] [openembedded-core] 05/10: wic: use STAGING_DATADIR as a default for bootimg_dir
git at git.openembedded.org
git at git.openembedded.org
Wed Mar 22 15:08:09 UTC 2017
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit afc486b6316f1118c8dcc74a5e217bb217dd1f85
Author: Ed Bartosh <ed.bartosh at linux.intel.com>
AuthorDate: Wed Mar 22 15:42:29 2017 +0200
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 at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
scripts/wic | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/scripts/wic b/scripts/wic
index 99721dc..8e9c05c 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:
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list