Fix for MACHINE_FEATURES check in u-boot.inc
This commit fixes a check against the MACHINE_FEATURES when patching a
new image with initial environment variables. This bug was blocking the
kernelname variable from being filled in, so the system wouldn't boot if
the image was loaded outside of the typical code update process (i.e.
QEMU, DediProg).
Resolves openbmc/openbmc#2781
Change-Id: I847d9bb216c0d8f680b342a3790519a9fc9b2c32
Signed-off-by: Michael Tritz <mtritz@us.ibm.com>
diff --git a/common/recipes-bsp/u-boot/u-boot.inc b/common/recipes-bsp/u-boot/u-boot.inc
index a5be9f8..623a25a 100644
--- a/common/recipes-bsp/u-boot/u-boot.inc
+++ b/common/recipes-bsp/u-boot/u-boot.inc
@@ -14,7 +14,7 @@
file://0001-config-ast-common-Add-conditional-factory-reset-comm.patch', '', d)}"
python do_configure () {
- if ((d.getVar("MACHINE_FEATURES", True)) == "obmc-ubi-fs"):
+ if "obmc-ubi-fs" in d.getVar("MACHINE_FEATURES", True):
version_id=do_get_versionID(d)
d.setVar('VERSION_ID', version_id)
bb.build.exec_func("patch_uboot", d)