On 5/3/21 1:44 PM, Jan Kiszka wrote:

On 03.05.21 13:28, Gylstorff Quirin wrote:

quoted

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

quoted

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

But does SWUpdate really depends on the U-Boot binary that is going to
be put on the device - or rather on u-boot-config? This looks fishy.

Jan

SWUpdate does not depends on the u-boot-binary. SWUpdate needs 
'fw_env.config'(u-boot-config) to interact with the u-boot environment.
As libubootenv does not request or provide 'fw_env.config' the code 
above is necessary. SWUPDATE_U_BOOT is only used for creating a build
order.

Another way would be add u-boot-config as dependency to libubootenv in
isar upstream. This would also mean that we maintain that package build
instead of using the one provided by Debian bullseye and later.

Quirin