[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4926/8267] wic: use 2 sysroots to find native executable

[Emmanuele Bassi <ebassi src gnome org>]

commit 6d5dd6e560fa95c4237b788f25d4bd20f5927160
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Tue Feb 21 11:37:17 2017 +0200

    wic: use 2 sysroots to find native executable
    
    Currently there is no way to specify a dependency on native
    tools for wic without modifying wic-tools recipe. Obvious
    way to make it more flexible is to use image sysroot and
    wic-tools together to find an executable.
    
    Modified run_native_cmd to use image and wic-tools sysroots
    to find native executable.
    
    [YOCTO #11017]
    
    (From OE-Core rev: 06f976cb7c593ab14ee221365d9afbaf9de94a91)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/utils/misc.py |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/scripts/lib/wic/utils/misc.py b/scripts/lib/wic/utils/misc.py
index 4b822f0..3bab2f1 100644
--- a/scripts/lib/wic/utils/misc.py
+++ b/scripts/lib/wic/utils/misc.py
@@ -105,9 +105,13 @@ def exec_native_cmd(cmd_and_args, native_sysroot, catch=3, pseudo=""):
 
     if pseudo:
         cmd_and_args = pseudo + cmd_and_args
+
+    wtools_sysroot = get_bitbake_var("RECIPE_SYSROOT_NATIVE", "wic-tools")
+
     native_paths = \
-        "%s/sbin:%s/usr/sbin:%s/usr/bin" % \
-        (native_sysroot, native_sysroot, native_sysroot)
+            "%s/sbin:%s/usr/sbin:%s/usr/bin:%s/sbin:%s/usr/sbin:%s/usr/bin" % \
+            (wtools_sysroot, wtools_sysroot, wtools_sysroot,
+             native_sysroot, native_sysroot, native_sysroot)
     native_cmd_and_args = "export PATH=%s:$PATH;%s" % \
                            (native_paths, cmd_and_args)
     logger.debug("exec_native_cmd: %s", cmd_and_args)