kas update, menu support, Isar update
v2 cover kas update, menu support, Isar update
Changes in v2:
- move to kas 2.6.2 bug-fix release
- make security image depend on buster (apparently broken for other releases)
- add Isar update
With kas 2.6 being released, this now allows to adopt the new "menu" feature and make the various image flavors and options more accessible.
@all: Please play a bit with the options and check if you find anything that does not work (crowd-sourced randconfig...).
Thanks,
Jan
Jan Kiszka (3):
Update to kas 2.6.2
Add kconfig menu
Update Isar revision
.gitignore | 1 + .gitlab-ci.yml | 2 +- Kconfig | 147 +++++++++++++++++++++++++++ README.md | 39 ++++--- kas-cip.yml | 2 +- kas/opt/ebg-secure-boot-base.yml | 2 +- kas/opt/ebg-secure-boot-snakeoil.yml | 2 +- kas/opt/ebg-snakeoil-swu.yml | 4 +- kas/opt/ebg-swu.yml | 4 +- 9 files changed, 180 insertions(+), 23 deletions(-) create mode 100644 Kconfig
Signature · 1 line
2.31.1
PATCH v2 1/3 Update to kas 2.6.2
From: Jan Kiszka <[email protected]>
Include paths are now repo-relative, adjust this.
--- .gitlab-ci.yml | 2 +- README.md | 2 +- kas/opt/ebg-secure-boot-base.yml | 2 +- kas/opt/ebg-secure-boot-snakeoil.yml | 2 +- kas/opt/ebg-snakeoil-swu.yml | 4 ++-- kas/opt/ebg-swu.yml | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-)
.gitlab-ci.yml +1 -1
@@ -1,4 +1,4 @@ -image: ghcr.io/siemens/kas/kas-isar:2.5 +image: ghcr.io/siemens/kas/kas-isar:2.6.2 variables: GIT_STRATEGY: clone
README.md +1 -1
@@ -12,7 +12,7 @@ from scratch. Install `kas-container` from the [kas project](https://github.com/siemens/kas): - wget https://raw.githubusercontent.com/siemens/kas/2.5/kas-container + wget https://raw.githubusercontent.com/siemens/kas/2.6.2/kas-container chmod a+x kas-container Furthermore, install docker and make sure you have required permissions to
kas/opt/ebg-secure-boot-base.yml +1 -1
@@ -12,7 +12,7 @@ header: version: 10 includes: - - efibootguard.yml + - kas/opt/efibootguard.yml local_conf_header: initramfs: |
kas/opt/ebg-secure-boot-snakeoil.yml +1 -1
@@ -12,7 +12,7 @@ header: version: 10 includes: - - ebg-secure-boot-base.yml + - kas/opt/ebg-secure-boot-base.yml local_conf_header:
kas/opt/ebg-snakeoil-swu.yml +2 -2
@@ -12,5 +12,5 @@ header: version: 10 includes: - - ebg-secure-boot-snakeoil.yml - - swupdate.yml + - kas/opt/ebg-secure-boot-snakeoil.yml + - kas/opt/swupdate.yml
kas/opt/ebg-swu.yml +2 -2
@@ -12,5 +12,5 @@ header: version: 10 includes: - - efibootguard.yml - - swupdate.yml + - kas/opt/efibootguard.yml + - kas/opt/swupdate.yml
Signature · 1 line
2.31.1
PATCH v2 2/3 Add kconfig menu
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
Use the new kas menu plugin to present available image options to the user. This also allows to model their dependencies, specifically as not all options are supported on all boards.
--- .gitignore | 1 + Kconfig | 147 +++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 37 +++++++++----- 3 files changed, 171 insertions(+), 14 deletions(-) create mode 100644 Kconfig
.gitignore +1 -0
@@ -3,3 +3,4 @@ isar/ kas-docker kas-container __pycache__ +.config.yaml*
Kconfig new file +147 -0
147 lines not on this page · raw message
README.md +23 -14
@@ -18,16 +18,30 @@ Install `kas-container` from the [kas project](https://github.com/siemens/kas): Furthermore, install docker and make sure you have required permissions to start containers. -To build, e.g., the QEMU AMD64 target inside Docker, invoke kas-container like -this: +Open up the image configuration menu and select the desired target and its +options: - ./kas-container build kas-cip.yml:kas/board/qemu-amd64.yml + ./kas-container menu -This image can be run using `start-qemu.sh x86`. +You can direct start the build from the menu. -The BeagleBone Black target is selected by `... kas-cip.yml:kas/board/bbb.yml`. In -order to build the image with the PREEMPT-RT kernel, append `:kas/opt/rt.yml` to -the above. Append `:kas/opt/4.4.yml` to use the kernel version 4.4 instead of 4.19. +If you prefer selecting the configuration via the command line, this builds +the BeagleBone Black target image with real-time kernel, e.g.: + + ./kas-container build kas-cip.yml:kas/board/bbb.yml:kas/opt/rt.yml + + +## Running Target Images + +When having built a virtual QEMU target image, this can be started directly. +Run, e.g., + + ./start-qemu.sh x86 + +when having built a QEMU AMD64 image. A security image for QEMU can be started +like this: + + TARGET_IMAGE=cip-core-image-security ./start-qemu.sh x86 Physical targets will generate ready-to-boot images under `build/tmp/deploy/images/`. To flash, e.g., the BeagleBone Black image to an SD
@@ -36,14 +50,9 @@ card, run dd if=build/tmp/deploy/images/bbb/cip-core-image-cip-core-buster-bbb.wic.img \ of=/dev/<medium-device> bs=1M status=progress -## Building Security target images -Building images for QEMU x86-64bit machine - - ./kas-container build kas-cip.yml:kas/board/qemu-amd64.yml:kas/opt/security.yml - -Run the generated securiy images on QEMU (x86-64bit) +or via bmap-tools - TARGET_IMAGE=cip-core-image-security ./start-qemu.sh amd64 + bmaptool copy build/tmp/deploy/images/bbb/cip-core-image-cip-core-buster-bbb.wic.img /dev/<medium-device> ## Community Resources
Signature · 1 line
2.31.1
PATCH v2 3/3 Update Isar revision
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
Brings a few smaller fixes and package log cleaning.
--- kas-cip.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kas-cip.yml +1 -1
@@ -22,7 +22,7 @@ repos: isar: url: https://github.com/ilbers/isar.git - refspec: 9b31dae3284127d4aed4b9331af1b1c3c31152f5 + refspec: ceb7e21154fc4862f704bb5c7739e87a26db6eb3 layers: meta:
Signature · 1 line
2.31.1