[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5655/8267] qemuboot: write native sysroot of qemu-helper into qemuboot.conf

[Emmanuele Bassi <ebassi src gnome org>]

commit ec9b108f468160e6f5abe215f37f7b32b3c2e305
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Wed Apr 12 23:41:00 2017 +0300

    qemuboot: write native sysroot of qemu-helper into qemuboot.conf
    
    Native sysroot of qemu-helper contains all required tools
    (qemu-system and tunctl atm) for runqemu to work. It's not
    removed by rm_dir and should always exist. It makes sense
    to write it into qemuboot.conf to make runqemu to use it
    as a default directory for native tools.
    
    This should also speed up runqemu as it doesn't need to run
    to run 'bitbake qemu-helper -e' to get its native sysroot.
    
    [YOCTO #11266]
    [YOCTO #11193]
    
    (From OE-Core rev: 0f207bfc1f7a4fd509b78d32bbe1a8d4ebea8053)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/qemuboot.bbclass |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/qemuboot.bbclass b/meta/classes/qemuboot.bbclass
index 2870388..cc5314e 100644
--- a/meta/classes/qemuboot.bbclass
+++ b/meta/classes/qemuboot.bbclass
@@ -87,7 +87,14 @@ python do_write_qemuboot_conf() {
     cf = configparser.ConfigParser()
     cf.add_section('config_bsp')
     for k in qemuboot_vars(d):
-        cf.set('config_bsp', k, '%s' % d.getVar(k))
+        # qemu-helper-native sysroot is not removed by rm_work and
+        # contains all tools required by runqemu
+        if k == 'STAGING_BINDIR_NATIVE':
+            val = os.path.join(d.getVar('BASE_WORKDIR'), d.getVar('BUILD_SYS'),
+                               'qemu-helper-native/1.0-r1/recipe-sysroot-native/usr/bin/')
+        else:
+            val = d.getVar(k)
+        cf.set('config_bsp', k, '%s' % val)
 
     # QB_DEFAULT_KERNEL's value of KERNEL_IMAGETYPE is the name of a symlink
     # to the kernel file, which hinders relocatability of the qb conf.