From: Tom Rini <trini@konsulko.com>
Date: Fri, 29 Sep 2017 14:28:19 +0000 (-0400)
Subject: image_types: Fix bmaptool support for RSS
X-Git-Tag: 2017-10~46
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=a93c5869cb716cba5e05bbe4fc2e1c11adb9e30f;p=openembedded-core.git

image_types: Fix bmaptool support for RSS

With RSS we need to ensure that when making a bmap image that the
python3 that we created is found via /usr/bin/env rather than the host
python3.  Otherwise we're relying on the build host to have bmaptool
support installed.

Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 61dca62631..b373b21714 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -311,3 +311,6 @@ DEPLOYABLE_IMAGE_TYPES ?= "hddimg iso"
 # The IMAGE_TYPES_MASKED variable will be used to mask out from the IMAGE_FSTYPES,
 # images that will not be built at do_rootfs time: vmdk, vdi, qcow2, hdddirect, hddimg, iso, etc.
 IMAGE_TYPES_MASKED ?= ""
+
+# bmap requires python3 to be in the PATH
+EXTRANATIVEPATH += "${@'python3-native' if d.getVar('IMAGE_FSTYPES').find('.bmap') else ''}"