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>

diff --git a/scripts/wic b/scripts/wic
index 99721dcc3319e1a60c7bb0e9960020b8152388d3..8e9c05c18c4dc69dbd1acdfe5a27074328e149e0 100755 (executable)
--- 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: