On 09.08.22 12:40, Quirin Gylstorff wrote:

From: Quirin Gylstorff <quirin.gylstorff@...>

Remove the kas option for efibootguard as it cannot build a image.
Move the package installation for swupdate to the include.

Changes V2:
- Readd WICVARS(KERNEL_IMAGE INITRD_IMAGE DTB_FILES)
- Fix setting WKS_FILE for ebg_swu

Changes V3:
- Fix assignment of WKS_FILE
- use weak assignment in conf/distro/cip-core-common.inc

Changes V4:
- Move `firmware-binaries` to kas/opt/ebg-swu
- kas/opt/ebg-secure-boot-snakeoil now depends on ebg-swu
- add DEBIAN_CONFLICTS between initramfs-verity-hook and initramfs-abrootfs-hook
as the system stucks in a reboot loop if both are installed.

Quirin Gylstorff (3):
kas: Remove efibootguard.yml
kas/opt/swupdate: Move the package installation to swupdate.inc
initramfs-*-hook: Add DEBIAN_CONFLICTS

conf/distro/cip-core-common.inc | 2 +-
kas/opt/ebg-secure-boot-snakeoil.yml | 11 ++----
kas/opt/ebg-swu.yml | 17 ++++++--
kas/opt/efibootguard.yml | 39 -------------------
kas/opt/swupdate.yml | 4 --
recipes-core/images/efibootguard.inc | 19 +++++++++
recipes-core/images/swupdate.inc | 3 ++
.../initramfs-abrootfs-hook_0.1.bb | 1 +
.../initramfs-verity-hook_0.1.bb | 1 +
9 files changed, 42 insertions(+), 55 deletions(-)
delete mode 100644 kas/opt/efibootguard.yml
create mode 100644 recipes-core/images/efibootguard.inc

Thanks, applied.

Jan

--
Siemens AG, Technology
Competence Center Embedded Linux

From: Quirin Gylstorff <quirin.gylstorff@...>

Remove the kas option for efibootguard as it cannot build a image.
Move the package installation for swupdate to the include.

Changes V2:
- Readd WICVARS(KERNEL_IMAGE INITRD_IMAGE DTB_FILES)
- Fix setting WKS_FILE for ebg_swu

Changes V3:
- Fix assignment of WKS_FILE
- use weak assignment in conf/distro/cip-core-common.inc

Changes V4:
- Move `firmware-binaries` to kas/opt/ebg-swu
- kas/opt/ebg-secure-boot-snakeoil now depends on ebg-swu
- add DEBIAN_CONFLICTS between initramfs-verity-hook and initramfs-abrootfs-hook
as the system stucks in a reboot loop if both are installed.

Quirin Gylstorff (3):
kas: Remove efibootguard.yml
kas/opt/swupdate: Move the package installation to swupdate.inc
initramfs-*-hook: Add DEBIAN_CONFLICTS

conf/distro/cip-core-common.inc | 2 +-
kas/opt/ebg-secure-boot-snakeoil.yml | 11 ++----
kas/opt/ebg-swu.yml | 17 ++++++--
kas/opt/efibootguard.yml | 39 -------------------
kas/opt/swupdate.yml | 4 --
recipes-core/images/efibootguard.inc | 19 +++++++++
recipes-core/images/swupdate.inc | 3 ++
.../initramfs-abrootfs-hook_0.1.bb | 1 +
.../initramfs-verity-hook_0.1.bb | 1 +
9 files changed, 42 insertions(+), 55 deletions(-)
delete mode 100644 kas/opt/efibootguard.yml
create mode 100644 recipes-core/images/efibootguard.inc

--
2.35.1