Rootless build and smaller fixes
cover Rootless build and smaller fixes
This primarily switches the Isar build to rootless mode - at least locally, our CI infrastructure will continue to grant privileges to the jobs. That will be changed with the next CI runner update later.
Further changes adjust the head of Xenomai 4 kernel branches to the new next/ schema and silence still failing RISC-V jobs.
Jan
Jan Kiszka (5):
linux-xenomai-4: Switch to next branches for latest kernel builds
ci: Allow riscv builds to fail
Update Isar revision
Update to kas 5.5
Switch to rootless builds
Kconfig | 10 +- README.md | 4 +- ci/lib/gitlab-ci-base.yml | 2 +- ci/lib/kernel/head.yml | 4 + kas-container | 329 ++++++++++-------- kas.yaml | 4 +- .../linux/linux-xenomai-4_latest.bb | 4 +- recipes-xenomai/xenomai/xenomai.inc | 2 +- 8 files changed, 206 insertions(+), 153 deletions(-)
Signature · 1 line
2.47.3
PATCH 1/5 linux-xenomai-4: Switch to next branches for latest kernel builds
From: Jan Kiszka <[email protected]>
Those are now marking the tip of the xenomai-4 development.
--- recipes-kernel/linux/linux-xenomai-4_latest.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-kernel/linux/linux-xenomai-4_latest.bb +2 -2
@@ -22,12 +22,12 @@ python () { if is_kernel(d, 'latest'): cmd = 'git ls-remote --tags --head --refs https://gitlab.com/Xenomai/xenomai4/linux-evl.git | ' \ 'sed -e "s/.*[[:space:]]refs\/\(tags\|heads\)\///" | ' \ - 'grep "^v7\.[0-9].*-evl-rebase" | ' \ + 'grep "^next/v7\.[0-9].*-evl-rebase" | ' \ 'sort -r -n -k 1.4 | head -1' (ret, out) = subprocess.getstatusoutput(cmd) d.setVar('LATEST_KERNEL_BRANCH', out) else: - d.setVar('LATEST_KERNEL_BRANCH', 'v6.18.y-evl-rebase') + d.setVar('LATEST_KERNEL_BRANCH', 'next/v6.18.y-evl-rebase') } GIT_BRANCH = "${@ \
Signature · 1 line
2.47.3
PATCH 2/5 ci: Allow riscv builds to fail
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
Integration is still ongoing, too many loose pieces are flying around. This may change soon again, but we need to shield us from unfixable CI failures for now.
--- ci/lib/kernel/head.yml | 4 ++++ 1 file changed, 4 insertions(+)
ci/lib/kernel/head.yml +4 -0
@@ -54,12 +54,14 @@ build-head:qemu-riscv64: LINUX_BUILD_OPTION: ":kas/opt/linux-head.yaml" KERNEL_VERSION: "head" CACHE_KERNEL: evl + allow_failure: true lava-test-head:qemu-riscv64: needs: [ "build-head:qemu-riscv64" ] extends: .lava-test:qemu-riscv64 variables: KERNEL_VERSION: "head" + allow_failure: true build-head:starfive-visionfive2: extends: .build:starfive-visionfive2
@@ -67,12 +69,14 @@ build-head:starfive-visionfive2: LINUX_BUILD_OPTION: ":kas/opt/linux-head.yaml" KERNEL_VERSION: "head" CACHE_KERNEL: evl + allow_failure: true lava-test-head:starfive-visionfive2: needs: [ "build-head:starfive-visionfive2" ] extends: .lava-test:starfive-visionfive2 variables: KERNEL_VERSION: "head" + allow_failure: true build-head:rpi4: extends: .build:rpi4
Signature · 1 line
2.47.3
PATCH 3/5 Update Isar revision
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
This will allow us to switch to rootless builds.
We need to adjust the dependency chain for the arch-all package xenomai-kernel-source as Isar changed its logic here.
--- kas.yaml | 2 +- recipes-xenomai/xenomai/xenomai.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
kas.yaml +1 -1
@@ -22,7 +22,7 @@ repos: isar: url: https://github.com/ilbers/isar.git - commit: 22ee5352eab6c38ac395da60895d09bacfe7b201 + commit: 436bc96f3869b4a139357afbabb039caf4df7c5c layers: meta:
recipes-xenomai/xenomai/xenomai.inc +1 -1
@@ -14,7 +14,7 @@ inherit print-revision MAINTAINER = "Xenomai <[email protected]>" -PROVIDES += "xenomai-kernel-source" +PROVIDES += "xenomai-kernel-source-archall" PROVIDES += "xenomai-runtime" PROVIDES += "xenomai-runtime-dbgsym" PROVIDES += "xenomai-testsuite"
Signature · 1 line
2.47.3
PATCH 4/5 Update to kas 5.5
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
Another precondition to use rootless mode.
--- Kconfig | 2 +- ci/lib/gitlab-ci-base.yml | 2 +- kas-container | 329 +++++++++++++++++++++----------------- kas.yaml | 2 +- 4 files changed, 187 insertions(+), 148 deletions(-)
Kconfig +1 -1
@@ -6,7 +6,7 @@ config KAS_INCLUDE_MAIN config KAS_BUILD_SYSTEM string - default "isar" + default "isar-privileged" config ARCH_X86 bool
ci/lib/gitlab-ci-base.yml +1 -1
@@ -30,7 +30,7 @@ variables: SSTATE_MAX_AGE: 14d default: - image: ghcr.io/siemens/kas/kas-isar:5.2 + image: ghcr.io/siemens/kas/kas-isar:5.5 .sstate-prepare: script:
kas-container +184 -145
543 lines not on this page · raw message
kas.yaml +1 -1
@@ -12,7 +12,7 @@ header: version: 14 -build_system: isar +build_system: isar-privileged distro: xenomai-demo target: demo-image
Signature · 1 line
2.47.3
PATCH 5/5 Switch to rootless builds
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
This removes the need to add a user to the docker group if podman is used.
--- Kconfig | 10 +++++++++- README.md | 4 +++- kas.yaml | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-)
Kconfig +9 -1
@@ -1,3 +1,11 @@ +# +# Xenomai Real-Time System +# +# Copyright (c) Siemens AG, 2021-2026 +# +# SPDX-License-Identifier: MIT +# + mainmenu "Xenomai Reference Images" config KAS_INCLUDE_MAIN
@@ -6,7 +14,7 @@ config KAS_INCLUDE_MAIN config KAS_BUILD_SYSTEM string - default "isar-privileged" + default "isar-rootless" config ARCH_X86 bool
README.md +3 -1
@@ -11,7 +11,9 @@ from scratch. ## Building Target Images -Install Docker and make sure you have the required permissions to start containers. +Install Podman (recommended) or Docker. If using Docker, see +[kas documentation](https://kas.readthedocs.io/en/latest/userguide/kas-container.html) +for more details. Next, invoke the configuration menu to select the desired image configuration and start the build:
kas.yaml +1 -1
@@ -12,7 +12,7 @@ header: version: 14 -build_system: isar-privileged +build_system: isar-rootless distro: xenomai-demo target: demo-image
Signature · 1 line
2.47.3
Re: [xenomai-images][PATCH 2/5] ci: Allow riscv builds to fail
In reply to Jan KiszkaQuoted 35 lines · Jan Kiszka
From: Jan Kiszka <[email protected]>
Integration is still ongoing, too many loose pieces are flying around. This may change soon again, but we need to shield us from unfixable CI failures for now.
Signed-off-by Jan Kiszka <[email protected]>--- ci/lib/kernel/head.yml | 4 ++++ 1 file changed, 4 insertions(+)ci/lib/kernel/head.yml +3
-0@@ -54,12 +54,14 @@ build-head:qemu-riscv64: LINUX_BUILD_OPTION: ":kas/opt/linux-head.yaml" KERNEL_VERSION: "head" CACHE_KERNEL: evl + allow_failure: true lava-test-head:qemu-riscv64: needs: [ "build-head:qemu-riscv64" ] extends: .lava-test:qemu-riscv64 variables: KERNEL_VERSION: "head" + allow_failure: true build-head:starfive-visionfive2: extends: .build:starfive-visionfive2@@ -67,12 +69,14 @@ build-head:starfive-visionfive2: LINUX_BUILD_OPTION: ":kas/opt/linux-head.yaml" KERNEL_VERSION: "head" CACHE_KERNEL: evl + allow_failure: true
ci/lib/kernel/head.yml build-head:starfive-visionfive2: · line 82
Quoted 10 lines
ci/lib/kernel/head.yml +1
-0lava-test-head:starfive-visionfive2: needs: [ "build-head:starfive-visionfive2" ] extends: .lava-test:starfive-visionfive2 variables: KERNEL_VERSION: "head" + allow_failure: true build-head:rpi4: extends: .build:rpi4
Things look good now, and this didn't make it into master so far. So I'm dropping it again now from next.
Jan
Signature · 2 lines
Siemens AG, Foundational Technologies Linux Expert Center
PATCH v2 3/5 Update Isar revision
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
This will allow us to switch to rootless builds.
We need to adjust the dependency chain for the arch-all package xenomai-kernel-source as Isar changed its logic here.
Furthermore, a xenomai-native target exists now to provide an arch- specific source package for the kernel. We need to account for them when setting preferred versions.
---
Changes in v2 (v1 was still in next):
- PREFERRED_VERSION for xenomai-native
- bump Isar to latest master (some more optimizations)
conf/distro/xenomai-demo.conf | 3 ++- kas.yaml | 2 +- kas/opt/xenomai-3.1.x-head.yaml | 3 ++- kas/opt/xenomai-3.1.x.yaml | 3 ++- kas/opt/xenomai-3.2.x-head.yaml | 3 ++- kas/opt/xenomai-3.2.x.yaml | 3 ++- kas/opt/xenomai-3.3.x-head.yaml | 3 ++- kas/opt/xenomai-3.3.x.yaml | 3 ++- kas/opt/xenomai-next.yaml | 3 ++- recipes-xenomai/xenomai/xenomai.inc | 2 +- 10 files changed, 18 insertions(+), 10 deletions(-)
conf/distro/xenomai-demo.conf +2 -1
@@ -1,7 +1,7 @@ # # Xenomai Real-Time System # -# Copyright (c) Siemens AG, 2018-2025 +# Copyright (c) Siemens AG, 2018-2026 # # Authors: # Jan Kiszka <[email protected]>
@@ -19,6 +19,7 @@ OVERRIDES .= ":xenomai${XENOMAI_MAJOR_VERSION}" PREFERRED_VERSION_xenomai ?= "3.3%" PREFERRED_VERSION_xenomai-compat ?= "3.3%" +PREFERRED_VERSION_xenomai-native ?= "3.3%" include conf/distro/include/xenomai-version.inc PREFERRED_VERSION_libevl ?= "5%"
kas.yaml +1 -1
@@ -22,7 +22,7 @@ repos: isar: url: https://github.com/ilbers/isar.git - commit: 22ee5352eab6c38ac395da60895d09bacfe7b201 + commit: abb61d6d9e0323f8d998d2643bb76757a0d1bb1f layers: meta:
kas/opt/xenomai-3.1.x-head.yaml +2 -1
@@ -1,7 +1,7 @@ # # Xenomai Real-Time System # -# Copyright (c) Siemens AG, 2020-2025 +# Copyright (c) Siemens AG, 2020-2026 # # Authors: # Jan Kiszka <[email protected]>
@@ -18,3 +18,4 @@ local_conf_header: xenomai-version: | PREFERRED_VERSION_xenomai = "stable-3.1.x" PREFERRED_VERSION_xenomai-compat = "stable-3.1.x" + PREFERRED_VERSION_xenomai-native = "stable-3.1.x"
kas/opt/xenomai-3.1.x.yaml +2 -1
@@ -1,7 +1,7 @@ # # Xenomai Real-Time System # -# Copyright (c) Siemens AG, 2025 +# Copyright (c) Siemens AG, 2025-2026 # # Authors: # Jan Kiszka <[email protected]>
@@ -18,3 +18,4 @@ local_conf_header: xenomai-version: | PREFERRED_VERSION_xenomai = "3.1%" PREFERRED_VERSION_xenomai-compat = "3.1%" + PREFERRED_VERSION_xenomai-native = "3.1%"
kas/opt/xenomai-3.2.x-head.yaml +2 -1
@@ -1,7 +1,7 @@ # # Xenomai Real-Time System # -# Copyright (c) Siemens AG, 2021-2025 +# Copyright (c) Siemens AG, 2021-2026 # # Authors: # Jan Kiszka <[email protected]>
@@ -18,3 +18,4 @@ local_conf_header: xenomai-version: | PREFERRED_VERSION_xenomai = "stable-3.2.x" PREFERRED_VERSION_xenomai-compat = "stable-3.2.x" + PREFERRED_VERSION_xenomai-native = "stable-3.2.x"
kas/opt/xenomai-3.2.x.yaml +2 -1
@@ -1,7 +1,7 @@ # # Xenomai Real-Time System # -# Copyright (c) Siemens AG, 2025 +# Copyright (c) Siemens AG, 2025-2026 # # Authors: # Jan Kiszka <[email protected]>
@@ -18,3 +18,4 @@ local_conf_header: xenomai-version: | PREFERRED_VERSION_xenomai = "3.2%" PREFERRED_VERSION_xenomai-compat = "3.2%" + PREFERRED_VERSION_xenomai-native = "3.2%"
kas/opt/xenomai-3.3.x-head.yaml +2 -1
@@ -1,7 +1,7 @@ # # Xenomai Real-Time System # -# Copyright (c) Siemens, 2025 +# Copyright (c) Siemens, 2025-2026 # # Authors: # Jan Kiszka <[email protected]>
@@ -18,3 +18,4 @@ local_conf_header: xenomai-version: | PREFERRED_VERSION_xenomai = "stable-3.3.x" PREFERRED_VERSION_xenomai-compat = "stable-3.3.x" + PREFERRED_VERSION_xenomai-native = "stable-3.3.x"
kas/opt/xenomai-3.3.x.yaml +2 -1
@@ -1,7 +1,7 @@ # # Xenomai Real-Time System # -# Copyright (c) Siemens AG, 2025 +# Copyright (c) Siemens AG, 2025-2026 # # Authors: # Jan Kiszka <[email protected]>
@@ -18,3 +18,4 @@ local_conf_header: xenomai-version: | PREFERRED_VERSION_xenomai = "3.3%" PREFERRED_VERSION_xenomai-compat = "3.3%" + PREFERRED_VERSION_xenomai-native = "3.3%"
kas/opt/xenomai-next.yaml +2 -1
@@ -1,7 +1,7 @@ # # Xenomai Real-Time System # -# Copyright (c) Siemens AG, 2019-2024 +# Copyright (c) Siemens AG, 2019-2026 # # Authors: # Quirin Gylstorff <[email protected]>
@@ -16,3 +16,4 @@ local_conf_header: xenomai-version: | PREFERRED_VERSION_xenomai = "next" PREFERRED_VERSION_xenomai-compat = "next" + PREFERRED_VERSION_xenomai-native = "next"
recipes-xenomai/xenomai/xenomai.inc +1 -1
@@ -14,7 +14,7 @@ inherit print-revision MAINTAINER = "Xenomai <[email protected]>" -PROVIDES += "xenomai-kernel-source" +PROVIDES += "xenomai-kernel-source-archall" PROVIDES += "xenomai-runtime" PROVIDES += "xenomai-runtime-dbgsym" PROVIDES += "xenomai-testsuite"
Signature · 1 line
2.47.3