From a212908153397f859894c7b4790e3200ddac8d0b Mon Sep 17 00:00:00 2001 From: Lluis Campos Date: Fri, 11 Dec 2020 17:12:39 +0100 Subject: [PATCH] [tests cfg] Rename features variable to MENDER_FEATURES Following recent changes in meta-mender and the test framework. Changelog: None Signed-off-by: Lluis Campos --- mender-convert-package | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mender-convert-package b/mender-convert-package index 66ca8ed..48659ac 100755 --- a/mender-convert-package +++ b/mender-convert-package @@ -340,15 +340,15 @@ log_info "Conversion has completed! \o/" if [ "${MENDER_GRUB_EFI_INTEGRATION}" == "y" ]; then boot_part_mountpoint="/boot/efi" - # This is the name of the DISTRO_FEATURES in Yocto - distro_feature="mender-grub" + # This is the name of the MENDER_FEATURES in Yocto + bootloader_feature="mender-grub" else boot_part_mountpoint="/uboot" - # This is the name of the DISTRO_FEATURES in Yocto - distro_feature="mender-uboot" + # This is the name of the MENDER_FEATURES in Yocto + bootloader_feature="mender-uboot" fi -distro_feature="${distro_feature} mender-convert" +mender_features="${bootloader_feature} mender-convert" cat <<- EOF > deploy/${image_name}.cfg MENDER_BOOT_PART="${boot_part_device}" @@ -364,7 +364,7 @@ MENDER_PARTITION_ALIGNMENT="${MENDER_PARTITION_ALIGNMENT}" MENDER_STORAGE_TOTAL_SIZE_MB="${MENDER_STORAGE_TOTAL_SIZE_MB}" MENDER_UBOOT_ENV_STORAGE_DEVICE_OFFSET="12582912" MENDER_ARTIFACT_NAME="${artifact_name}" -DISTRO_FEATURES="${distro_feature}" +MENDER_FEATURES="${mender_features}" DEPLOY_DIR_IMAGE="${PWD}/deploy" MENDER_MACHINE="${device_type}" EOF