mbox series

[isar-cip-core,v5,0/3] clean up kas/opt

Message ID 20220812095112.632930-1-Quirin.Gylstorff@siemens.com (mailing list archive)
Headers show
Series clean up kas/opt | expand

Message

Quirin Gylstorff Aug. 12, 2022, 9:51 a.m. UTC
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

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.

Changes V5:
 - Fix set WKS_FILE in case by using default instead of weak assignment
 - reoder patches
 - rebase onto 29d3546 origin/next


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

 kas/opt/ebg-secure-boot-snakeoil.yml          | 11 ++----
 kas/opt/ebg-swu.yml                           | 18 +++++++--
 kas/opt/efibootguard.yml                      | 39 -------------------
 kas/opt/swupdate.yml                          |  4 --
 recipes-core/images/efibootguard.inc          | 18 +++++++++
 recipes-core/images/swupdate.inc              |  3 ++
 .../initramfs-abrootfs-hook_0.1.bb            |  1 +
 .../initramfs-verity-hook_0.1.bb              |  1 +
 8 files changed, 41 insertions(+), 54 deletions(-)
 delete mode 100644 kas/opt/efibootguard.yml
 create mode 100644 recipes-core/images/efibootguard.inc

Comments

Jan Kiszka Aug. 14, 2022, 9:36 a.m. UTC | #1
On 12.08.22 12:51, Quirin Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> 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.
> 
> Changes V5:
>  - Fix set WKS_FILE in case by using default instead of weak assignment
>  - reoder patches
>  - rebase onto 29d3546 origin/next
> 
> 
> Quirin Gylstorff (3):
>   initramfs-*-hook: Add DEBIAN_CONFLICTS
>   kas/opt/swupdate: Move the package installation to swupdate.inc
>   kas: Remove efibootguard.yml
> 
>  kas/opt/ebg-secure-boot-snakeoil.yml          | 11 ++----
>  kas/opt/ebg-swu.yml                           | 18 +++++++--
>  kas/opt/efibootguard.yml                      | 39 -------------------
>  kas/opt/swupdate.yml                          |  4 --
>  recipes-core/images/efibootguard.inc          | 18 +++++++++
>  recipes-core/images/swupdate.inc              |  3 ++
>  .../initramfs-abrootfs-hook_0.1.bb            |  1 +
>  .../initramfs-verity-hook_0.1.bb              |  1 +
>  8 files changed, 41 insertions(+), 54 deletions(-)
>  delete mode 100644 kas/opt/efibootguard.yml
>  create mode 100644 recipes-core/images/efibootguard.inc
> 

Thanks, applied. This time, the pipeline stayed green ;).

Jan