[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7626/8267] wic: run bmaptool with native Python3

[Emmanuele Bassi <ebassi src gnome org>]

commit cef80d0dfedd5a692267fa5ffa2146af4856304a
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Wed Sep 6 15:08:25 2017 +0300

    wic: run bmaptool with native Python3
    
    Modified wic code to run bmaptool using native Python3
    from wic-tools native sysroot.
    
    [YOCTO #11891]
    
    (From OE-Core rev: 7fca44e03130c0860cc5df2093902773f426c774)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/plugins/imager/direct.py |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py
index 5765bbb..a6abc3d 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -213,8 +213,10 @@ class DirectPlugin(ImagerPlugin):
         # Generate .bmap
         if self.bmap:
             logger.debug("Generating bmap file for %s", disk_name)
-            exec_native_cmd("bmaptool create %s -o %s.bmap" % (full_path, full_path),
-                            self.native_sysroot)
+            python = os.path.join(self.native_sysroot, 'usr/bin/python3-native/python3')
+            bmaptool = os.path.join(self.native_sysroot, 'usr/bin/bmaptool')
+            exec_native_cmd("%s %s create %s -o %s.bmap" % \
+                            (python, bmaptool, full_path, full_path), self.native_sysroot)
         # Compress the image
         if self.compressor:
             logger.debug("Compressing disk %s with %s", disk_name, self.compressor)