summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-09-06 15:08:25 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-11 17:30:29 +0100
commitcef80d0dfedd5a692267fa5ffa2146af4856304a (patch)
tree0a783d40ba8b5d2ee173dce6bb302e98fef7a176
parent04ef46e2b2b753321408db02a2df3753b85ac0dd (diff)
downloadpoky-cef80d0dfedd5a692267fa5ffa2146af4856304a.tar.gz
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>
-rw-r--r--scripts/lib/wic/plugins/imager/direct.py6
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 5765bbb527..a6abc3d09e 100644
--- a/scripts/lib/wic/plugins/imager/direct.py
+++ b/scripts/lib/wic/plugins/imager/direct.py
@@ -213,8 +213,10 @@ class DirectPlugin(ImagerPlugin):
213 # Generate .bmap 213 # Generate .bmap
214 if self.bmap: 214 if self.bmap:
215 logger.debug("Generating bmap file for %s", disk_name) 215 logger.debug("Generating bmap file for %s", disk_name)
216 exec_native_cmd("bmaptool create %s -o %s.bmap" % (full_path, full_path), 216 python = os.path.join(self.native_sysroot, 'usr/bin/python3-native/python3')
217 self.native_sysroot) 217 bmaptool = os.path.join(self.native_sysroot, 'usr/bin/bmaptool')
218 exec_native_cmd("%s %s create %s -o %s.bmap" % \
219 (python, bmaptool, full_path, full_path), self.native_sysroot)
218 # Compress the image 220 # Compress the image
219 if self.compressor: 221 if self.compressor:
220 logger.debug("Compressing disk %s with %s", disk_name, self.compressor) 222 logger.debug("Compressing disk %s with %s", disk_name, self.compressor)