[isar-cip-core][RFC 0/2] clean up kas/opt


Quirin Gylstorff
 

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.

Quirin Gylstorff (2):
kas: Remove efibootguard.yml
kas/opt/swupdate: Move the package installation to swupdate.inc

kas/opt/ebg-secure-boot-snakeoil.yml | 10 +++----
kas/opt/ebg-swu.yml | 9 +++----
kas/opt/efibootguard.yml | 39 ----------------------------
kas/opt/swupdate.yml | 4 ---
recipes-core/images/efibootguard.inc | 26 +++++++++++++++++++
recipes-core/images/swupdate.inc | 3 +++
6 files changed, 36 insertions(+), 55 deletions(-)
delete mode 100644 kas/opt/efibootguard.yml
create mode 100644 recipes-core/images/efibootguard.inc

--
2.35.1


Jan Kiszka
 

On 01.08.22 16:57, 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.

Quirin Gylstorff (2):
kas: Remove efibootguard.yml
kas/opt/swupdate: Move the package installation to swupdate.inc

kas/opt/ebg-secure-boot-snakeoil.yml | 10 +++----
kas/opt/ebg-swu.yml | 9 +++----
kas/opt/efibootguard.yml | 39 ----------------------------
kas/opt/swupdate.yml | 4 ---
recipes-core/images/efibootguard.inc | 26 +++++++++++++++++++
recipes-core/images/swupdate.inc | 3 +++
6 files changed, 36 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


Jan Kiszka
 

On 02.08.22 11:15, Jan Kiszka wrote:
On 01.08.22 16:57, 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.

Quirin Gylstorff (2):
kas: Remove efibootguard.yml
kas/opt/swupdate: Move the package installation to swupdate.inc

kas/opt/ebg-secure-boot-snakeoil.yml | 10 +++----
kas/opt/ebg-swu.yml | 9 +++----
kas/opt/efibootguard.yml | 39 ----------------------------
kas/opt/swupdate.yml | 4 ---
recipes-core/images/efibootguard.inc | 26 +++++++++++++++++++
recipes-core/images/swupdate.inc | 3 +++
6 files changed, 36 insertions(+), 55 deletions(-)
delete mode 100644 kas/opt/efibootguard.yml
create mode 100644 recipes-core/images/efibootguard.inc
Thanks, applied.
This breaks something when building kas-cip.yml:kas/board/qemu-arm64.yml:kas/opt/5.10.yml:kas/opt/bullseye.yml:kas/opt/ebg-secure-boot-snakeoil.yml:

NOTE: Executing Tasks
ERROR: cip-core-image-1.0-r0 do_image_wic: ExecutionError('/build/tmp/work/cip-core-bullseye-arm64/cip-core-image-qemu-arm64/1.0-r0/temp/run.do_image_wic.24213', 1, None, None)
ERROR: Logfile of failure stored in: /build/tmp/work/cip-core-bullseye-arm64/cip-core-image-qemu-arm64/1.0-r0/temp/log.do_image_wic.24213
Log data follows:
| DEBUG: Executing python function set_image_size
| DEBUG: Python function set_image_size finished
| DEBUG: Executing shell function do_image_wic
| INFO: Creating image(s)...
|
| WARNING: KERNEL_IMAGE not set. Use default:
| WARNING: INITRD_IMAGE not set
|
| ERROR: _exec_cmd: bg_gen_unified_kernel /build/tmp/work/cip-core-bullseye-arm64/cip-core-image-qemu-arm64/1.0-r0/rootfs/usr/share/efibootguard/kernel-stubaa64.efi /build/tmp/deploy/images/qemu-arm64/vmlinuz /build/tmp/deploy/images/qemu-arm64/linux.efi -c "panic=5" -i /build/tmp/deploy/images/qemu-arm64/initrd.img returned '2' instead of 0
| output: usage: bg_gen_unified_kernel [-h] [-c "CMDLINE"] [-d DTB] [-i INITRD]
| STUB KERNEL UNIFIEDIMAGE
| bg_gen_unified_kernel: error: argument KERNEL: can't open '/build/tmp/deploy/images/qemu-arm64/vmlinuz': [Errno 2] No such file or directory: '/build/tmp/deploy/images/qemu-arm64/vmlinuz'
|
| WARNING: exit code 1 from a shell command.
| ERROR: ExecutionError('/build/tmp/work/cip-core-bullseye-arm64/cip-core-image-qemu-arm64/1.0-r0/temp/run.do_image_wic.24213', 1, None, None)
ERROR: Task (/repo/recipes-core/images/cip-core-image.bb:do_image_wic) failed with exit code '1'
NOTE: Tasks Summary: Attempted 160 tasks of which 139 didn't need to be rerun and 1 failed.

I'm pulling the series from next again (wasn't pushed yet, noticed locally).

Jan

--
Siemens AG, Technology
Competence Center Embedded Linux