Skip to contentSkip to conversation

Update kernel versions, kas and isar

PATCH New Jan Kiszka 1 participant 7 messages Jan 13, 2025

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

cover Update kernel versions, kas and isar

Most important change is probably the introduction of kernel 6.12 for both Xenomai streams.

Jan

Jan Kiszka (6):
Update kas to 4.6
Update isar revision
linux-xenomai: Switch to v6.1.y-cip branches
linux-xenomai: Update to latest releases
Add kernel 6.12 bits
ci: Replace kernel 6.6 with 6.12

 Kconfig                                       | 10 ++++
 ci/compat_jobs.yml                            | 14 ++---
 ci/gitlab-ci-base.yml                         |  4 +-
 ci/kernel_6_12.yml                            | 52 +++++++++++++++++++
 ci/kernel_6_12_physical.yml                   | 52 +++++++++++++++++++
 ci/kernel_6_6.yml                             | 52 -------------------
 ci/kernel_6_6_physical.yml                    | 52 -------------------
 ci/xenomai_3_next.yml                         |  6 +--
 ci/xenomai_3_next_long_term.yml               |  4 +-
 ci/xenomai_4_next.yml                         |  6 +--
 kas-container                                 | 26 +++++-----
 kas.yml                                       |  4 +-
 opt-linux-6.12.yml                            | 17 ++++++
 opt-linux-latest-6.12.yml                     | 19 +++++++
 recipes-kernel/linux/linux-xenomai-3_4.19.bb  |  6 +--
 recipes-kernel/linux/linux-xenomai-3_4.4.bb   |  6 +--
 recipes-kernel/linux/linux-xenomai-3_5.10.bb  |  4 +-
 recipes-kernel/linux/linux-xenomai-3_5.15.bb  |  4 +-
 recipes-kernel/linux/linux-xenomai-3_5.4.bb   |  6 +--
 recipes-kernel/linux/linux-xenomai-3_6.1.bb   |  4 +-
 ...nomai-3_6.6.bb => linux-xenomai-3_6.12.bb} |  4 +-
 recipes-kernel/linux/linux-xenomai-3_6.6.bb   |  4 +-
 .../linux/linux-xenomai-3_latest.bb           | 11 ++--
 recipes-kernel/linux/linux-xenomai-4_6.1.bb   |  4 +-
 ...nomai-4_6.6.bb => linux-xenomai-4_6.12.bb} |  6 +--
 recipes-kernel/linux/linux-xenomai-4_6.6.bb   |  4 +-
 .../linux/linux-xenomai-4_latest.bb           |  5 +-
 27 files changed, 219 insertions(+), 167 deletions(-)
 create mode 100644 ci/kernel_6_12.yml
 create mode 100644 ci/kernel_6_12_physical.yml
 delete mode 100644 ci/kernel_6_6.yml
 delete mode 100644 ci/kernel_6_6_physical.yml
 create mode 100644 opt-linux-6.12.yml
 create mode 100644 opt-linux-latest-6.12.yml
 copy recipes-kernel/linux/{linux-xenomai-3_6.6.bb => linux-xenomai-3_6.12.bb} (73%)
 copy recipes-kernel/linux/{linux-xenomai-4_6.6.bb => linux-xenomai-4_6.12.bb} (54%)
Signature · 1 line
2.43.0
author
#1 lore raw

PATCH 1/6 Update kas to 4.6

From: Jan Kiszka <[email protected]>

Just house-keeping.

---
 ci/gitlab-ci-base.yml |  4 ++--
 kas-container         | 26 ++++++++++++++------------
 2 files changed, 16 insertions(+), 14 deletions(-)
ci/gitlab-ci-base.yml +2 -2
index 853d929..aaf0df7 100644
@@ -1,7 +1,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2019 - 2024
+# Copyright (c) Siemens AG, 2019 - 2025
 #
 # Authors:
 #  Quirin Gylstorff <[email protected]>
@@ -30,7 +30,7 @@ variables:
   SSTATE_MAX_AGE: 14d
 
 default:
-  image: ghcr.io/siemens/kas/kas-isar:4.5
+  image: ghcr.io/siemens/kas/kas-isar:4.6
 
 .sstate-prepare:
   script:
kas-container +14 -12
index 6b2131c..0437381 100755
@@ -27,24 +27,28 @@
 
 set -e
 
-KAS_IMAGE_VERSION_DEFAULT="4.5"
+KAS_IMAGE_VERSION_DEFAULT="4.6"
 KAS_CONTAINER_IMAGE_PATH_DEFAULT="ghcr.io/siemens/kas"
 KAS_CONTAINER_IMAGE_NAME_DEFAULT="kas"
 KAS_CONTAINER_SELF_NAME="$(basename "$0")"
 
+# usage [exit_code]
 usage()
 {
+	EXIT_CODE="$1"
 	SELF="${KAS_CONTAINER_SELF_NAME}"
+
 	printf "%b" "Usage: ${SELF} [OPTIONS] { build | shell } [KASOPTIONS] [KASFILE]\n"
-	printf "%b" "       ${SELF} [OPTIONS] { checkout | dump } [KASOPTIONS] [KASFILE]\n"
+	printf "%b" "       ${SELF} [OPTIONS] { checkout | dump | lock } [KASOPTIONS] [KASFILE]\n"
 	printf "%b" "       ${SELF} [OPTIONS] for-all-repos [KASOPTIONS] [KASFILE] COMMAND\n"
-	printf "%b" "       ${SELF} [OPTIONS] { clean | cleansstate | cleanall} [KASFILE]\n"
+	printf "%b" "       ${SELF} [OPTIONS] { clean | cleansstate | cleanall } [KASFILE]\n"
 	printf "%b" "       ${SELF} [OPTIONS] menu [KCONFIG]\n"
 	printf "%b" "\nPositional arguments:\n"
 	printf "%b" "build\t\t\tCheck out repositories and build target.\n"
 	printf "%b" "checkout\t\tCheck out repositories but do not build.\n"
 	printf "%b" "dump\t\t\tCheck out repositories and write flat version\n"
 	printf "%b" "    \t\t\tof config to stdout.\n"
+	printf "%b" "lock\t\t\tCreate and update kas project lockfiles\n"
 	printf "%b" "shell\t\t\tRun a shell in the build environment.\n"
 	printf "%b" "for-all-repos\t\tRun specified command in each repository.\n"
 	printf "%b" "clean\t\t\tClean build artifacts, keep sstate cache and " \
@@ -63,9 +67,7 @@ usage()
 	printf "%b" "--runtime-args\t\tAdditional arguments to pass to the " \
 			"container runtime\n"
 	printf "%b" "\t\t\tfor running the build.\n"
-	printf "%b" "-d\t\t\tPrint debug output (deprecated, use -l debug).\n"
 	printf "%b" "-l, --log-level\t\tSet log level (default=info).\n"
-	printf "%b" "-v\t\t\tSame as -d (deprecated).\n"
 	printf "%b" "--version\t\tprint program version.\n"
 	printf "%b" "--ssh-dir\t\tDirectory containing SSH configurations.\n"
 	printf "%b" "\t\t\tAvoid \$HOME/.ssh unless you fully trust the " \
@@ -80,10 +82,12 @@ usage()
 		    "\t\t\t(default for build command)\n"
 	printf "%b" "--repo-rw\t\tMount current repository writeable\n" \
 		    "\t\t\t(default for shell command)\n"
+	printf "%b" "-h, --help\t\tShow this help message and exit.\n"
 	printf "%b" "\n"
 	printf "%b" "You can force the use of podman over docker using " \
 		    "KAS_CONTAINER_ENGINE=podman.\n"
-	exit 1
+
+	exit "${EXIT_CODE:-1}"
 }
 
 fatal_error(){
@@ -269,11 +273,6 @@ while [ $# -gt 0 ]; do
 		KAS_REPO_MOUNT_OPT="rw"
 		shift 1
 		;;
-	-v | -d)
-		KAS_VERBOSE=1
-		KAS_OPTIONS_DIRECT="${KAS_OPTIONS_DIRECT} -d"
-		shift 1
-		;;
 	-l | --log-level)
 		if [ "$2" = "debug" ]; then
 			KAS_VERBOSE=1
@@ -285,6 +284,9 @@ while [ $# -gt 0 ]; do
 		echo "${KAS_CONTAINER_SELF_NAME} $KAS_IMAGE_VERSION_DEFAULT"
 		exit 0
 		;;
+	-h | --help)
+		usage 0
+		;;
 	--*)
 		usage
 		;;
@@ -293,7 +295,7 @@ while [ $# -gt 0 ]; do
 		shift 1
 		break
 		;;
-	shell)
+	shell|lock)
 		KAS_REPO_MOUNT_OPT_DEFAULT="rw"
 		KAS_CMD=$1
 		shift 1
Signature · 1 line
2.43.0
author
#2 lore raw

PATCH 2/6 Update isar revision

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

Brings slightly faster mmdebstrap.

---
 kas.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
kas.yml +2 -2
index 778165d..2020ed7 100644
@@ -1,7 +1,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2018-2024
+# Copyright (c) Siemens AG, 2018-2025
 #
 # Authors:
 #  Jan Kiszka <[email protected]>
@@ -22,7 +22,7 @@ repos:
 
   isar:
     url: https://github.com/ilbers/isar.git
-    commit: 75488685dd2123417deb70f6d0923b8c2772954e
+    commit: 483093e11cd722f0c88dc2fcbed1e937fc0abb60
     layers:
       meta:
 
Signature · 1 line
2.43.0
author
#3 lore raw

PATCH 3/6 linux-xenomai: Switch to v6.1.y-cip branches

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

Maintenance of dovetail and evl for kernel v6.1 moved on from LTS-based to CIP-based.

---
 recipes-kernel/linux/linux-xenomai-3_6.1.bb    | 4 ++--
 recipes-kernel/linux/linux-xenomai-3_latest.bb | 8 ++++----
 recipes-kernel/linux/linux-xenomai-4_6.1.bb    | 4 ++--
 recipes-kernel/linux/linux-xenomai-4_latest.bb | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)
recipes-kernel/linux/linux-xenomai-3_6.1.bb +2 -2
index 1b41692..f052b20 100644
@@ -1,7 +1,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2021-2023
+# Copyright (c) Siemens AG, 2021-2025
 #
 # Authors:
 #  Jan Kiszka <[email protected]>
@@ -11,4 +11,4 @@
 
 require recipes-kernel/linux/linux-xenomai-3-dovetail.inc
 
-SRCREV ?= "v6.1.11-dovetail1"
+SRCREV ?= "v6.1.121-cip34-dovetail1"
recipes-kernel/linux/linux-xenomai-3_latest.bb +4 -4
index ab13897..ff1708b 100644
@@ -1,7 +1,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2019-2023
+# Copyright (c) Siemens AG, 2019-2025
 #
 # Authors:
 #  Quirin Gylstorff <[email protected]>
@@ -46,7 +46,7 @@ GIT_BRANCH = "${@ \
     else 'ipipe-x86-5.4.y' if is_kernel(d, '5.4') \
     else 'v5.10.y-cip-dovetail-rebase' if is_kernel(d, '5.10') \
     else 'v5.15.y-dovetail-rebase' if is_kernel(d, '5.15') \
-    else 'v6.1.y-dovetail-rebase' if is_kernel(d, '6.1') \
+    else 'v6.1.y-cip-dovetail-rebase' if is_kernel(d, '6.1') \
     else 'v6.6.y-dovetail-rebase' if is_kernel(d, '6.6') \
     else d.getVar('LATEST_KERNEL_BRANCH') }"
 
@@ -60,7 +60,7 @@ GIT_BRANCH:armhf = "${@ \
     else 'ipipe/5.4.y' if is_kernel(d, '5.4') \
     else 'v5.10.y-cip-dovetail-rebase' if is_kernel(d, '5.10') \
     else 'v5.15.y-dovetail-rebase' if is_kernel(d, '5.15') \
-    else 'v6.1.y-dovetail-rebase' if is_kernel(d, '6.1') \
+    else 'v6.1.y-cip-dovetail-rebase' if is_kernel(d, '6.1') \
     else 'v6.6.y-dovetail-rebase' if is_kernel(d, '6.6') \
     else d.getVar('LATEST_KERNEL_BRANCH') }"
 
@@ -72,7 +72,7 @@ GIT_BRANCH:arm64 = "${@ \
     else 'ipipe/5.4.y' if is_kernel(d, '5.4') \
     else 'v5.10.y-cip-dovetail-rebase' if is_kernel(d, '5.10') \
     else 'v5.15.y-dovetail-rebase' if is_kernel(d, '5.15') \
-    else 'v6.1.y-dovetail-rebase' if is_kernel(d, '6.1') \
+    else 'v6.1.y-cip-dovetail-rebase' if is_kernel(d, '6.1') \
     else 'v6.6.y-dovetail-rebase' if is_kernel(d, '6.6') \
     else d.getVar('LATEST_KERNEL_BRANCH') }"
 
recipes-kernel/linux/linux-xenomai-4_6.1.bb +2 -2
index a037e4c..32e2131 100644
@@ -1,7 +1,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2023-2024
+# Copyright (c) Siemens AG, 2023-2025
 #
 # Authors:
 #  Clara Kowalsky <[email protected]>
@@ -11,4 +11,4 @@
 
 require recipes-kernel/linux/linux-xenomai-4-evl.inc
 
-SRCREV ?= "v6.1.61-evl2-rebase"
+SRCREV ?= "v6.1.121-cip34-evl1-rebase"
recipes-kernel/linux/linux-xenomai-4_latest.bb +2 -2
index c4a254f..307c550 100644
@@ -1,7 +1,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2024
+# Copyright (c) Siemens AG, 2024-2025
 #
 # Authors:
 #  Jan Kiszka <[email protected]>
@@ -31,7 +31,7 @@ python () {
 }
 
 GIT_BRANCH = "${@ \
-    'v6.1.y-evl-rebase' if is_kernel(d, '6.1') \
+    'v6.1.y-cip-evl-rebase' if is_kernel(d, '6.1') \
     else 'v6.6.y-evl-rebase' if is_kernel(d, '6.6') \
     else d.getVar('LATEST_KERNEL_BRANCH') }"
 
Signature · 1 line
2.43.0
author
#4 lore raw

PATCH 4/6 linux-xenomai: Update to latest releases

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

---
 recipes-kernel/linux/linux-xenomai-3_4.19.bb | 6 +++---
 recipes-kernel/linux/linux-xenomai-3_4.4.bb  | 6 +++---
 recipes-kernel/linux/linux-xenomai-3_5.10.bb | 4 ++--
 recipes-kernel/linux/linux-xenomai-3_5.15.bb | 4 ++--
 recipes-kernel/linux/linux-xenomai-3_5.4.bb  | 6 +++---
 recipes-kernel/linux/linux-xenomai-3_6.6.bb  | 4 ++--
 recipes-kernel/linux/linux-xenomai-4_6.6.bb  | 4 ++--
 7 files changed, 17 insertions(+), 17 deletions(-)
recipes-kernel/linux/linux-xenomai-3_4.19.bb +3 -3
index 298610f..a4b6dfb 100644
@@ -1,7 +1,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2019-2023
+# Copyright (c) Siemens AG, 2019-2025
 #
 # Authors:
 #  Quirin Gylstorff <[email protected]>
@@ -12,12 +12,12 @@
 require recipes-kernel/linux/linux-xenomai-3.inc
 
 SRC_URI:append:amd64 = " git://github.com/xenomai-ci/ipipe-x86.git;protocol=https;nobranch=1"
-SRCREV:amd64 ?= "ipipe-core-4.19.317-cip111-x86-29"
+SRCREV:amd64 ?= "ipipe-core-4.19.322-cip113-x86-30"
 
 SRC_URI:append:arm64 = " git://github.com/xenomai-ci/ipipe-arm64.git;protocol=https;nobranch=1"
 SRCREV:arm64 ?= "ipipe-core-4.19.229-cip67-arm64-13"
 
 SRC_URI:append:armhf = " git://github.com/xenomai-ci/ipipe-arm.git;protocol=https;nobranch=1"
-SRCREV:armhf ?= "ipipe-core-4.19.229-cip67-arm-18"
+SRCREV:armhf ?= "ipipe-core-4.19.271-cip90-arm-19"
 
 PV ?= "${@d.getVar('SRCREV').split('-')[2]}+"
recipes-kernel/linux/linux-xenomai-3_4.4.bb +3 -3
index e7a7e60..678f7f6 100644
@@ -1,7 +1,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2018-2023
+# Copyright (c) Siemens AG, 2018-2025
 #
 # Authors:
 #  Jan Kiszka <[email protected]>
@@ -12,10 +12,10 @@
 require recipes-kernel/linux/linux-xenomai-3.inc
 
 SRC_URI:append:amd64 = " git://github.com/xenomai-ci/ipipe.git;protocol=https;nobranch=1"
-SRCREV:amd64 ?= "ipipe-core-4.4.302-cip79-x86-39"
+SRCREV:amd64 ?= "ipipe-core-4.4.302-cip91-x86-40"
 
 SRC_URI:append:armhf = " git://github.com/xenomai-ci/ipipe.git;protocol=https;nobranch=1"
 SRC_URI:append:armhf = " ${@ 'file://bbb_4.4.cfg' if d.getVar('MACHINE') == 'beagle-bone-black' else '' }"
-SRCREV:armhf ?= "ipipe-core-4.4.302-cip79-arm-24"
+SRCREV:armhf ?= "ipipe-core-4.4.302-cip91-arm-25"
 
 PV ?= "${@d.getVar('SRCREV').split('-')[2]}+"
recipes-kernel/linux/linux-xenomai-3_5.10.bb +2 -2
index 9b01708..088d0d8 100644
@@ -1,7 +1,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2021-2023
+# Copyright (c) Siemens AG, 2021-2025
 #
 # Authors:
 #  Jan Kiszka <[email protected]>
@@ -11,4 +11,4 @@
 
 require recipes-kernel/linux/linux-xenomai-3-dovetail.inc
 
-SRCREV ?= "v5.10.161-dovetail1"
+SRCREV ?= "v5.10.229-cip54-dovetail1"
recipes-kernel/linux/linux-xenomai-3_5.15.bb +2 -2
index 9c5ba27..286c64e 100644
@@ -1,7 +1,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2021-2023
+# Copyright (c) Siemens AG, 2021-2025
 #
 # Authors:
 #  Jan Kiszka <[email protected]>
@@ -11,4 +11,4 @@
 
 require recipes-kernel/linux/linux-xenomai-3-dovetail.inc
 
-SRCREV ?= "v5.15.85-dovetail1"
+SRCREV ?= "v5.15.173-dovetail1"
recipes-kernel/linux/linux-xenomai-3_5.4.bb +3 -3
index 5dced1d..71e0066 100644
@@ -1,7 +1,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2021-2023
+# Copyright (c) Siemens AG, 2021-2025
 #
 # Authors:
 #  Jan Kiszka <[email protected]>
@@ -12,12 +12,12 @@
 require recipes-kernel/linux/linux-xenomai-3.inc
 
 SRC_URI:append:amd64 = " git://github.com/xenomai-ci/ipipe-x86.git;protocol=https;nobranch=1"
-SRCREV:amd64 ?= "ipipe-core-5.4.281-x86-16"
+SRCREV:amd64 ?= "ipipe-core-5.4.284-x86-17"
 
 SRC_URI:append:arm64 = " git://github.com/xenomai-ci/ipipe-arm64.git;protocol=https;nobranch=1"
 SRCREV:arm64 ?= "ipipe-core-5.4.180-arm64-5"
 
 SRC_URI:append:armhf = " git://github.com/xenomai-ci/ipipe-arm.git;protocol=https;nobranch=1"
-SRCREV:armhf ?= "ipipe-core-5.4.180-arm-5"
+SRCREV:armhf ?= "ipipe-core-5.4.231-arm-6"
 
 PV ?= "${@d.getVar('SRCREV').split('-')[2]}+"
recipes-kernel/linux/linux-xenomai-3_6.6.bb +2 -2
index b20eb19..cc765e1 100644
@@ -1,7 +1,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2024
+# Copyright (c) Siemens AG, 2024-2025
 #
 # Authors:
 #  Jan Kiszka <[email protected]>
@@ -11,4 +11,4 @@
 
 require recipes-kernel/linux/linux-xenomai-3-dovetail.inc
 
-SRCREV ?= "v6.6-dovetail1"
+SRCREV ?= "v6.6.69-dovetail1"
recipes-kernel/linux/linux-xenomai-4_6.6.bb +2 -2
index f499bd0..730b0da 100644
@@ -1,7 +1,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2023-2024
+# Copyright (c) Siemens AG, 2023-2025
 #
 # Authors:
 #  Clara Kowalsky <[email protected]>
@@ -11,4 +11,4 @@
 
 require recipes-kernel/linux/linux-xenomai-4-evl.inc
 
-SRCREV ?= "v6.6-evl2-rebase"
+SRCREV ?= "v6.6.69-evl1-rebase"
Signature · 1 line
2.43.0
author
#5 lore raw

PATCH 5/6 Add kernel 6.12 bits

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

Enable support for using this latest LTS kernel for Xenomai 3 and 4. We intentionally not yet change any defaults, though.

---
 Kconfig                                       | 10 ++++++++++
 opt-linux-6.12.yml                            | 17 +++++++++++++++++
 opt-linux-latest-6.12.yml                     | 19 +++++++++++++++++++
 recipes-kernel/linux/linux-xenomai-3_6.12.bb  | 14 ++++++++++++++
 .../linux/linux-xenomai-3_latest.bb           |  3 +++
 recipes-kernel/linux/linux-xenomai-4_6.12.bb  | 14 ++++++++++++++
 .../linux/linux-xenomai-4_latest.bb           |  1 +
 7 files changed, 78 insertions(+)
 create mode 100644 opt-linux-6.12.yml
 create mode 100644 opt-linux-latest-6.12.yml
 create mode 100644 recipes-kernel/linux/linux-xenomai-3_6.12.bb
 create mode 100644 recipes-kernel/linux/linux-xenomai-4_6.12.bb
Kconfig +10 -0
index 26aa63e..5aa06bd 100644
@@ -116,6 +116,14 @@ config KERNEL_LATEST
 	bool "Head of latest Dovetail branch"
 	depends on XENOMAI_LATEST
 
+config KERNEL_6_12_LATEST
+	bool "Head of 6.12 Dovetail branch"
+	depends on XENOMAI_LATEST || XENOMAI_3_3
+
+config KERNEL_6_12
+	bool "Latest 6.12 Dovetail release"
+	depends on XENOMAI_LATEST || XENOMAI_3_3
+
 config KERNEL_6_6_LATEST
 	bool "Head of 6.6 Dovetail branch"
 	depends on XENOMAI_LATEST || XENOMAI_3_3
@@ -177,6 +185,8 @@ endchoice
 config KAS_INCLUDE_KERNEL
 	string
 	default "opt-linux-latest.yml" if KERNEL_LATEST
+	default "opt-linux-latest-6.12.yml" if KERNEL_6_12_LATEST
+	default "opt-linux-6.12.yml" if KERNEL_6_12
 	default "opt-linux-latest-6.6.yml" if KERNEL_6_6_LATEST
 	default "opt-linux-6.6.yml" if KERNEL_6_6
 	default "opt-linux-latest-6.1.yml" if KERNEL_6_1_LATEST
opt-linux-6.12.yml new file +17 -0
new file mode 100644
index 0000000..8132364
@@ -0,0 +1,17 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2025
+#
+# Authors:
+#  Jan Kiszka <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+  version: 14
+
+local_conf_header:
+  linux-xenomai-version: |
+    PREFERRED_VERSION_linux-xenomai-3 = "6.12%"
opt-linux-latest-6.12.yml new file +19 -0
new file mode 100644
index 0000000..27d4845
@@ -0,0 +1,19 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2025
+#
+# Authors:
+#  Jan Kiszka <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+  version: 14
+
+local_conf_header:
+  linux-xenomai-version: |
+    PREFERRED_VERSION_linux-xenomai-3 = "9999-%"
+    PREFERRED_VERSION_linux-xenomai-4 = "9999-%"
+    LATEST_GIT_BRANCH = "6.12"
recipes-kernel/linux/linux-xenomai-3_6.12.bb new file +14 -0
new file mode 100644
index 0000000..62fbe67
@@ -0,0 +1,14 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2025
+#
+# Authors:
+#  Jan Kiszka <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+require recipes-kernel/linux/linux-xenomai-3-dovetail.inc
+
+SRCREV ?= "v6.12.8-dovetail1"
recipes-kernel/linux/linux-xenomai-3_latest.bb +3 -0
index ff1708b..0aeeaa2 100644
@@ -48,6 +48,7 @@ GIT_BRANCH = "${@ \
     else 'v5.15.y-dovetail-rebase' if is_kernel(d, '5.15') \
     else 'v6.1.y-cip-dovetail-rebase' if is_kernel(d, '6.1') \
     else 'v6.6.y-dovetail-rebase' if is_kernel(d, '6.6') \
+    else 'v6.12.y-dovetail-rebase' if is_kernel(d, '6.12') \
     else d.getVar('LATEST_KERNEL_BRANCH') }"
 
 GIT_REPO:armhf = "${@ \
@@ -62,6 +63,7 @@ GIT_BRANCH:armhf = "${@ \
     else 'v5.15.y-dovetail-rebase' if is_kernel(d, '5.15') \
     else 'v6.1.y-cip-dovetail-rebase' if is_kernel(d, '6.1') \
     else 'v6.6.y-dovetail-rebase' if is_kernel(d, '6.6') \
+    else 'v6.12.y-dovetail-rebase' if is_kernel(d, '6.12') \
     else d.getVar('LATEST_KERNEL_BRANCH') }"
 
 GIT_REPO:arm64 = "${@ \
@@ -74,6 +76,7 @@ GIT_BRANCH:arm64 = "${@ \
     else 'v5.15.y-dovetail-rebase' if is_kernel(d, '5.15') \
     else 'v6.1.y-cip-dovetail-rebase' if is_kernel(d, '6.1') \
     else 'v6.6.y-dovetail-rebase' if is_kernel(d, '6.6') \
+    else 'v6.12.y-dovetail-rebase' if is_kernel(d, '6.12') \
     else d.getVar('LATEST_KERNEL_BRANCH') }"
 
 SRC_URI += "${GIT_REPO};protocol=https;branch=${GIT_BRANCH}"
recipes-kernel/linux/linux-xenomai-4_6.12.bb new file +14 -0
new file mode 100644
index 0000000..75fa7ee
@@ -0,0 +1,14 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2025
+#
+# Authors:
+#  Jan Kiszka <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+require recipes-kernel/linux/linux-xenomai-4-evl.inc
+
+SRCREV ?= "v6.12.8-evl1-rebase"
recipes-kernel/linux/linux-xenomai-4_latest.bb +1 -0
index 307c550..689c50e 100644
@@ -33,6 +33,7 @@ python () {
 GIT_BRANCH = "${@ \
     'v6.1.y-cip-evl-rebase' if is_kernel(d, '6.1') \
     else 'v6.6.y-evl-rebase' if is_kernel(d, '6.6') \
+    else 'v6.12.y-evl-rebase' if is_kernel(d, '6.12') \
     else d.getVar('LATEST_KERNEL_BRANCH') }"
 
 SRC_URI += "git://source.denx.de/Xenomai/xenomai4/linux-evl.git;protocol=https;branch=${GIT_BRANCH}"
Signature · 1 line
2.43.0
author
#6 lore raw

PATCH 6/6 ci: Replace kernel 6.6 with 6.12

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

Moving forward to the latest LTS while dropping the previous latest one helps keeping the test matrix size under control. In addition, 6.6 is likely discontinued on Xenomai 3 and 4 side soon.

---
 ci/compat_jobs.yml              | 14 ++++-----
 ci/kernel_6_12.yml              | 52 +++++++++++++++++++++++++++++++++
 ci/kernel_6_12_physical.yml     | 52 +++++++++++++++++++++++++++++++++
 ci/kernel_6_6.yml               | 52 ---------------------------------
 ci/kernel_6_6_physical.yml      | 52 ---------------------------------
 ci/xenomai_3_next.yml           |  6 ++--
 ci/xenomai_3_next_long_term.yml |  4 +--
 ci/xenomai_4_next.yml           |  6 ++--
 8 files changed, 119 insertions(+), 119 deletions(-)
 create mode 100644 ci/kernel_6_12.yml
 create mode 100644 ci/kernel_6_12_physical.yml
 delete mode 100644 ci/kernel_6_6.yml
 delete mode 100644 ci/kernel_6_6_physical.yml
ci/compat_jobs.yml +7 -7
index 3e2d377..b5ad60a 100644
@@ -1,7 +1,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2023-2024
+# Copyright (c) Siemens AG, 2023-2025
 #
 # Authors:
 #  Florian Bezdeka <[email protected]>
@@ -26,23 +26,23 @@ lava-test-5.15-compat:x86-64-efi:
   variables:
     KERNEL_VERSION: "5.15"
 
-build-6.6-compat:rpi4:
+build-6.12-compat:rpi4:
   extends:
     - .build:rpi4
     - .compat-vars
   rules:
     - if: '$XENOMAI_VERSION != "3_2_x-compat"'
   variables:
-    LINUX_BUILD_OPTION: ":opt-linux-latest-6.6.yml"
-    KERNEL_VERSION: "6.6"
+    LINUX_BUILD_OPTION: ":opt-linux-latest-6.12.yml"
+    KERNEL_VERSION: "6.12"
     CACHE_KERNEL: dovetail
 
-lava-test-6.6-compat:rpi4:
-  needs: [ "build-6.6-compat:rpi4" ]
+lava-test-6.12-compat:rpi4:
+  needs: [ "build-6.12-compat:rpi4" ]
   extends:
     - .lava-test:rpi4
     - .compat-vars
   rules:
     - if: '$XENOMAI_VERSION != "3_2_x-compat"'
   variables:
-    KERNEL_VERSION: "6.6"
+    KERNEL_VERSION: "6.12"
ci/kernel_6_12.yml new file +52 -0

52 lines not on this page · raw message

ci/kernel_6_12_physical.yml new file +52 -0

52 lines not on this page · raw message

ci/kernel_6_6.yml deleted +0 -52

52 lines not on this page · raw message

ci/kernel_6_6_physical.yml deleted +0 -52

52 lines not on this page · raw message

ci/xenomai_3_next.yml +3 -3
index 1a49f6e..d05596f 100644
@@ -1,7 +1,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2019 - 2024
+# Copyright (c) Siemens AG, 2019-2025
 #
 # Authors:
 #  Quirin Gylstorff <[email protected]>
@@ -14,10 +14,10 @@ include:
   - local: '/ci/kernel_5_10.yml'
   - local: '/ci/kernel_5_15.yml'
   - local: '/ci/kernel_6_1.yml'
-  - local: '/ci/kernel_6_6.yml'
+  - local: '/ci/kernel_6_12.yml'
   - local: '/ci/xenomai_3_next_compat.yml'
 
 variables:
   XENOMAI_BUILD_OPTION: ":opt-xenomai-next.yml:opt-debug.yml"
   XENOMAI_VERSION: "next"
-  LATEST_KERNEL_VERSION: "6.6"
+  LATEST_KERNEL_VERSION: "6.12"
ci/xenomai_3_next_long_term.yml +2 -2
index e3740f5..93c0e2f 100644
@@ -11,11 +11,11 @@
 
 include:
   - local: '/ci/gitlab-ci-base.yml'
-  - local: '/ci/kernel_6_6_physical.yml'
+  - local: '/ci/kernel_6_12_physical.yml'
 
 variables:
   XENOMAI_BUILD_OPTION: ":opt-xenomai-next.yml"
   XENOMAI_VERSION: "next"
-  LATEST_KERNEL_VERSION: "6.6"
+  LATEST_KERNEL_VERSION: "6.12"
   TEST_RUNTIME_SECONDS: 3600
   TEST_COMMAND: "xeno-test -k -l 'dohell -m /tmp ${TEST_RUNTIME_SECONDS}' ${ADDITIONAL_XENO_TEST_ARGS} -- -m ${TEST_MAXIMUM_LATENCY}"
ci/xenomai_4_next.yml +3 -3
index 64657ff..36ea986 100644
@@ -1,7 +1,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2023-2024
+# Copyright (c) Siemens AG, 2023-2025
 #
 # Authors:
 #  Clara Kowalsky <[email protected]>
@@ -12,11 +12,11 @@
 include:
   - local: '/ci/gitlab-ci-base.yml'
   - local: '/ci/kernel_6_1.yml'
-  - local: '/ci/kernel_6_6.yml'
+  - local: '/ci/kernel_6_12.yml'
 
 variables:
   XENOMAI_BUILD_OPTION: ":opt-libevl-next.yml:opt-debug.yml"
   XENOMAI_VERSION: "next"
-  LATEST_KERNEL_VERSION: "6.6"
+  LATEST_KERNEL_VERSION: "6.12"
   BUILD_IDENTIFIER: "evl-${XENOMAI_VERSION}_kernel-${KERNEL_VERSION}"
   CACHE_KERNEL: evl
Signature · 1 line
2.43.0