On 4/30/21 4:50 PM, Jan Kiszka wrote:

On 30.04.21 15:01, Q. Gylstorff wrote:

quoted

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>
---
Changes in V2:
  - fix typo in commit message
  - use variable in kas/opt/*.yml

  classes/swupdate-config.bbclass      | 10 +++++-----
  kas/opt/ebg-secure-boot-snakeoil.yml |  2 +-
  kas/opt/ebg-swu.yml                  |  4 ++--
  kas/opt/qemu-swupdate.yml            |  2 +-
  4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/classes/swupdate-config.bbclass b/classes/swupdate-config.bbclass
index 9909113..0c1067a 100644
--- a/classes/swupdate-config.bbclass
+++ b/classes/swupdate-config.bbclass

@@ -51,13 +51,13 @@ KFEATURE_u-boot[BUILD_DEB_DEPENDS] = "libubootenv-dev"
  KFEATURE_u-boot[DEBIAN_DEPENDS] = "${@ 'libubootenv0.1, u-boot-${MACHINE}-config' \
                                            if d.getVar("USE_U_BOOT_CONFIG", True) == "true" \
                                            else 'libubootenv0.1'}"
-KFEATURE_u-boot[DEPENDS] = "${U_BOOT} libubootenv"
+KFEATURE_u-boot[DEPENDS] = "${SWUPDATE_U_BOOT} libubootenv"

Still leaves me and probably other users clueless what SWUPDATE_U_BOOT
should be. Simply "u-boot-${MACHINE}"?

Jan

SWUPDATE_U_BOOT should be the name of the u-boot package.

In case the layer (e.g. isar-cip-core) supplies the u-boot binary, 
`SWUPDATE_U_BOOT` should be defined as `u-boot-${MACHINE}`.


Debian provides some as package, e.g. [1].


I could add `u-boot-${MACHINE}` as default and a README section.


[1]: https://packages.debian.org/buster/u-boot-imx

Quirin

quoted

  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":

@@ -68,11 +68,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"