[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4191/8267] wic: rebuild wic-tools if its sysroot doesn't exist

[Emmanuele Bassi <ebassi src gnome org>]

commit e0193182c589e12f8a13c4f2ff44c9abe5451cd7
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Thu Jan 19 16:01:34 2017 +0200

    wic: rebuild wic-tools if its sysroot doesn't exist
    
    Rebuild wic-tools if its native sysroot doesn't exist to ensure
    that all required tools are available.
    
    (From OE-Core rev: 0d005d099a2b8ee1303b98710cdc78e06e14ab39)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/wic |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/scripts/wic b/scripts/wic
index f09dbc2..8918cb4 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -175,11 +175,23 @@ 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)
-        native_sysroot = os.path.join(get_bitbake_var("RECIPE_SYSROOT_NATIVE", "wic-tools"))
+        native_sysroot = get_bitbake_var("RECIPE_SYSROOT_NATIVE",
+                                         "wic-tools", cache=False)
     else:
         if options.build_rootfs:
             print("Image name is not specified, exiting. (Use -e/--image-name to specify it)\n")
             sys.exit(1)
+        native_sysroot = options.native_sysroot
+
+    if not native_sysroot or not os.path.isdir(native_sysroot):
+        print("Building wic-tools...\n")
+        if bitbake_main(BitBakeConfigParameters("bitbake wic-tools".split()),
+                        cookerdata.CookerConfiguration()):
+            sys.exit(1)
+        native_sysroot = get_bitbake_var("RECIPE_SYSROOT_NATIVE", "wic-tools")
+        if not native_sysroot:
+            print("Unable to find the location of the native tools sysroot to use\n")
+            sys.exit(1)
 
     wks_file = args[0]