[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5268/8267] wic: use STAGING_DATADIR as a default for bootimg_dir

[Emmanuele Bassi <ebassi src gnome org>]

commit 3ea735d390799012b16505f845c5d7e2d14d4a9b
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   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.
    
    (From OE-Core rev: afc486b6316f1118c8dcc74a5e217bb217dd1f85)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/wic |    3 +--
 1 files changed, 1 insertions(+), 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: