From ed24b94e9a5dd396bcfe3b416309dda9e1e5a05b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 3 Oct 2025 16:15:07 +0100 Subject: [PATCH] oeqa/selftest/bblock/fitimage: Fix changing MACHINE during the test With config fragments, changing MACHINE in the test like this no longer works. Use the forcevarable override to allow it to work. This also needs a tweak to bitbake to work correctly, sent seperately. Whilst ugly, this avoids the need to start changing config fragments. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/bblock.py | 4 ++-- meta/lib/oeqa/selftest/cases/fitimage.py | 26 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/bblock.py b/meta/lib/oeqa/selftest/cases/bblock.py index 2b62d2a0aa2..cb99d32bb5d 100644 --- a/meta/lib/oeqa/selftest/cases/bblock.py +++ b/meta/lib/oeqa/selftest/cases/bblock.py @@ -122,11 +122,11 @@ class BBLock(OESelftestTestCase): else: machine = "qemux86-64" - self.write_config('MACHINE = "%s"\n' % machine) + self.write_config('MACHINE:forcevariable = "%s"\n' % machine) self.lock_recipes(recipes, tasks) - self.write_config('MACHINE = "%s"\n' % self.td["MACHINE"]) + self.write_config('MACHINE:forcevariable = "%s"\n' % self.td["MACHINE"]) # modify quilt's do_compile task self.modify_tasks(recipes, tasks) diff --git a/meta/lib/oeqa/selftest/cases/fitimage.py b/meta/lib/oeqa/selftest/cases/fitimage.py index 3c408577476..195b9ee8b59 100644 --- a/meta/lib/oeqa/selftest/cases/fitimage.py +++ b/meta/lib/oeqa/selftest/cases/fitimage.py @@ -787,7 +787,7 @@ FIT_CONF_PREFIX = "foo-" config = """ DISTRO = "poky" -MACHINE = "beaglebone-yocto" +MACHINE:forcevariable = "beaglebone-yocto" """ self.write_config(config) @@ -828,7 +828,7 @@ MACHINE = "beaglebone-yocto" """ config = """ # Enable creation of fitImage -MACHINE = "beaglebone-yocto" +MACHINE:forcevariable = "beaglebone-yocto" # Add a devicetree overlay which does not need kernel sources PREFERRED_PROVIDER_virtual/dtb = "bbb-dtbs-as-ext" """ @@ -855,7 +855,7 @@ PREFERRED_PROVIDER_virtual/dtb = "bbb-dtbs-as-ext" # Generate a configuration section which gets included into the local.conf file config = """ # Enable creation of fitImage -MACHINE = "beaglebone-yocto" +MACHINE:forcevariable = "beaglebone-yocto" UBOOT_SIGN_ENABLE = "1" UBOOT_SIGN_KEYDIR = "${TOPDIR}/signing-keys" UBOOT_SIGN_KEYNAME = "dev" @@ -903,7 +903,7 @@ FIT_CONF_DEFAULT_DTB = "am335x-bonegreen.dtb" # Generate a configuration section which gets included into the local.conf file config = """ # Enable creation of fitImage -MACHINE = "beaglebone-yocto" +MACHINE:forcevariable = "beaglebone-yocto" UBOOT_SIGN_ENABLE = "1" FIT_GENERATE_KEYS = "1" UBOOT_SIGN_KEYDIR = "${TOPDIR}/signing-keys" @@ -939,7 +939,7 @@ UBOOT_MKIMAGE_SIGN_ARGS = "-c 'a smart comment'" config = """ DISTRO = "poky" -MACHINE = "beaglebone-yocto" +MACHINE:forcevariable = "beaglebone-yocto" INITRAMFS_IMAGE = "core-image-minimal-initramfs" INITRAMFS_SCRIPTS = "" UBOOT_MACHINE = "am335x_evm_defconfig" @@ -993,7 +993,7 @@ FIT_HASH_ALG = "sha256" config = """ DISTRO = "poky" -MACHINE = "beaglebone-yocto" +MACHINE:forcevariable = "beaglebone-yocto" INITRAMFS_IMAGE_BUNDLE = "1" INITRAMFS_IMAGE = "core-image-minimal-initramfs" INITRAMFS_SCRIPTS = "" @@ -1412,7 +1412,7 @@ class UBootFitImageTests(FitImageTestCase): """ config = """ # We need at least CONFIG_SPL_LOAD_FIT and CONFIG_SPL_OF_CONTROL set -MACHINE = "qemuarm" +MACHINE:forcevariable = "qemuarm" UBOOT_MACHINE = "am57xx_evm_defconfig" SPL_BINARY = "MLO" @@ -1451,7 +1451,7 @@ UBOOT_FIT_DESC = "A model description" config = """ # There's no U-boot defconfig with CONFIG_FIT_SIGNATURE yet, so we need at # least CONFIG_SPL_LOAD_FIT and CONFIG_SPL_OF_CONTROL set -MACHINE = "qemuarm" +MACHINE:forcevariable = "qemuarm" UBOOT_MACHINE = "am57xx_evm_defconfig" SPL_BINARY = "MLO" # Enable creation and signing of the U-Boot fitImage @@ -1498,7 +1498,7 @@ UBOOT_FIT_HASH_ALG = "sha256" config = """ # There's no U-boot deconfig with CONFIG_FIT_SIGNATURE yet, so we need at # least CONFIG_SPL_LOAD_FIT and CONFIG_SPL_OF_CONTROL set -MACHINE = "qemuarm" +MACHINE:forcevariable = "qemuarm" UBOOT_MACHINE = "am57xx_evm_defconfig" SPL_BINARY = "MLO" # Enable creation and signing of the U-Boot fitImage @@ -1546,7 +1546,7 @@ UBOOT_SIGN_KEYNAME = "cfg-oe-selftest" """ config = """ # We need at least CONFIG_SPL_LOAD_FIT and CONFIG_SPL_OF_CONTROL set -MACHINE = "qemuarm" +MACHINE:forcevariable = "qemuarm" UBOOT_MACHINE = "am57xx_evm_defconfig" SPL_BINARY = "MLO" @@ -1612,7 +1612,7 @@ UBOOT_FIT_ARM_TRUSTED_FIRMWARE_ENTRYPOINT = "0x80280000" config = """ # There's no U-boot deconfig with CONFIG_FIT_SIGNATURE yet, so we need at # least CONFIG_SPL_LOAD_FIT and CONFIG_SPL_OF_CONTROL set -MACHINE = "qemuarm" +MACHINE:forcevariable = "qemuarm" UBOOT_MACHINE = "am57xx_evm_defconfig" SPL_BINARY = "MLO" # Enable creation and signing of the U-Boot fitImage @@ -1676,7 +1676,7 @@ UBOOT_FIT_ARM_TRUSTED_FIRMWARE_ENTRYPOINT = "0x80280000" """ config = """ # Enable creation of fitImage -MACHINE = "beaglebone-yocto" +MACHINE:forcevariable = "beaglebone-yocto" UBOOT_SIGN_ENABLE = "1" UBOOT_SIGN_KEYDIR = "${TOPDIR}/signing-keys" UBOOT_SIGN_KEYNAME = "the-kernel-config-key" @@ -1715,7 +1715,7 @@ FIT_SIGN_INDIVIDUAL = "1" config = """ # There's no U-boot defconfig with CONFIG_FIT_SIGNATURE yet, so we need at # least CONFIG_SPL_LOAD_FIT and CONFIG_SPL_OF_CONTROL set -MACHINE = "qemuarm" +MACHINE:forcevariable = "qemuarm" UBOOT_MACHINE = "am57xx_evm_defconfig" # Enable creation and signing of the U-Boot fitImage (no SPL) UBOOT_FITIMAGE_ENABLE = "1" -- 2.47.3