[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5469/8267] devtool: point runqemu to correct native bindir

[Emmanuele Bassi <ebassi src gnome org>]

commit 0ffc7b8d2e72265a5a206cd3229112566d96d2f9
Author: brian avery <brian avery intel com>
Date:   Tue Apr 4 16:23:24 2017 -0700

    devtool: point runqemu to correct native bindir
    
    devtool/runqemu.py was relying on STAGING_BINDIR_NATIVE to find the host
    tools it needed like qemu-system-<arch>.  In the post RSS world, this no
    longer exists. This patch points it to
    {STAGING_DIR}/{BUILD_ARCH}/{bindir_native}.
    
    [YOCTO #11223]
    
    (From OE-Core rev: 1910f9e9336bfedc8278a3bc02e7e7f934a4fc86)
    
    Signed-off-by: brian avery <brian avery intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/devtool/runqemu.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/scripts/lib/devtool/runqemu.py b/scripts/lib/devtool/runqemu.py
index 641664e..e26cf28 100644
--- a/scripts/lib/devtool/runqemu.py
+++ b/scripts/lib/devtool/runqemu.py
@@ -32,7 +32,9 @@ def runqemu(args, config, basepath, workspace):
     tinfoil = setup_tinfoil(config_only=True, basepath=basepath)
     try:
         machine = tinfoil.config_data.getVar('MACHINE')
-        bindir_native = tinfoil.config_data.getVar('STAGING_BINDIR_NATIVE')
+        bindir_native = os.path.join(tinfoil.config_data.getVar('STAGING_DIR'),
+                                     tinfoil.config_data.getVar('BUILD_ARCH'),
+                                     tinfoil.config_data.getVar('bindir_native').lstrip(os.path.sep))
     finally:
         tinfoil.shutdown()