[cip-dev][isar-cip-core][PATCH v3 2/2] swupdate-config: add prefix to variables
From: Quirin Gylstorff <hidden>
Date: 2021-05-05 08:12:47
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Quirin Gylstorff <redacted> The variables U_BOOT and BOOTLOADER are only used for swupdate. Add the prefix SWUPDATE to indicate the intended usage. Signed-off-by: Quirin Gylstorff <redacted> --- classes/swupdate-config.bbclass | 8 ++++---- kas/opt/ebg-secure-boot-snakeoil.yml | 2 +- kas/opt/ebg-swu.yml | 4 ++-- kas/opt/qemu-swupdate.yml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/classes/swupdate-config.bbclass b/classes/swupdate-config.bbclass
index 5af4eba..4e46b37 100644
--- a/classes/swupdate-config.bbclass
+++ b/classes/swupdate-config.bbclass@@ -60,7 +60,7 @@ KFEATURE_u-boot[KCONFIG_SNIPPETS] = "file://swupdate_defconfig_u-boot.snippet" SWUPDATE_LUASCRIPT ?= "swupdate_handlers.lua" def get_bootloader_featureset(d): - bootloader = d.getVar("BOOTLOADER", True) or "" + bootloader = d.getVar("SWUPDATE_BOOTLOADER", True) or "" if bootloader == "efibootguard": return "efibootguard" if bootloader == "u-boot":
@@ -71,11 +71,11 @@ SWUPDATE_KFEATURES ??= "" KFEATURES = "${SWUPDATE_KFEATURES}" KFEATURES += "${@get_bootloader_featureset(d)}" -# Astonishingly, as an anonymous python function, BOOTLOADER is always None +# Astonishingly, as an anonymous python function, SWUPDATE_BOOTLOADER is always None # one time before it gets set. So the following must be a task. python do_check_bootloader () { - bootloader = d.getVar("BOOTLOADER", True) or "None" + bootloader = d.getVar("SWUPDATE_BOOTLOADER", True) or "None" if not bootloader in ["efibootguard", "u-boot"]: - bb.warn("swupdate: BOOTLOADER set to incompatible value: " + bootloader) + bb.warn("swupdate: SWUPDATE_BOOTLOADER set to incompatible value: " + bootloader) } addtask check_bootloader before do_fetch
diff --git a/kas/opt/ebg-secure-boot-snakeoil.yml b/kas/opt/ebg-secure-boot-snakeoil.yml
index 8a72084..c0ed1a2 100644
--- a/kas/opt/ebg-secure-boot-snakeoil.yml
+++ b/kas/opt/ebg-secure-boot-snakeoil.yml@@ -20,7 +20,7 @@ local_conf_header: # Add snakeoil and ovmf binaries for qemu IMAGER_BUILD_DEPS += "ebg-secure-boot-snakeoil ovmf-binaries" IMAGER_INSTALL += "ebg-secure-boot-snakeoil" - WKS_FILE = "${MACHINE}-${BOOTLOADER}-secureboot.wks" + WKS_FILE = "${MACHINE}-efibootguard-secureboot.wks" ovmf: | # snakeoil certs are only part of backports
diff --git a/kas/opt/ebg-swu.yml b/kas/opt/ebg-swu.yml
index aa3aed1..63dda09 100644
--- a/kas/opt/ebg-swu.yml
+++ b/kas/opt/ebg-swu.yml@@ -15,7 +15,7 @@ header: local_conf_header: swupdate: | IMAGE_INSTALL_append = " swupdate efibootguard" - BOOTLOADER = "efibootguard" + SWUPDATE_BOOTLOADER = "efibootguard" efibootguard: | WDOG_TIMEOUT = "0"
@@ -23,4 +23,4 @@ local_conf_header: wic: | IMAGE_TYPE = "wic-swu-img" - WKS_FILE ?= "${MACHINE}-${BOOTLOADER}.wks" + WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
diff --git a/kas/opt/qemu-swupdate.yml b/kas/opt/qemu-swupdate.yml
index 3f5fedf..daebd2c 100644
--- a/kas/opt/qemu-swupdate.yml
+++ b/kas/opt/qemu-swupdate.yml@@ -16,4 +16,4 @@ header: local_conf_header: qemu-wic: | IMAGE_TYPE ?= "wic-swu-img" - WKS_FILE = "qemu-amd64-${BOOTLOADER}.wks" + WKS_FILE = "qemu-amd64-${SWUPDATE_BOOTLOADER}.wks"
--
2.20.1