]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
image_types: Fix bmaptool support for RSS
authorTom Rini <trini@konsulko.com>
Fri, 29 Sep 2017 14:28:19 +0000 (10:28 -0400)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 7 Oct 2017 22:20:40 +0000 (23:20 +0100)
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.

(From OE-Core rev: a93c5869cb716cba5e05bbe4fc2e1c11adb9e30f)

Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/image_types.bbclass

index 61dca626311ec0fb1eca9eab2c4dd45edb2fc38d..b373b217145f366e6a80adcb16ac47c8a395244f 100644 (file)
@@ -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 ''}"