[xenomai-images][PATCH 5/6] linux-xenomai: Renovate xenomai-4 kernel versions

From: Jan Kiszka <[email protected]>

6.1.y-cip-evl is now EOL, drop it. Bump the rest to latest releases.

Signed-off-by: Jan Kiszka <[email protected]>
---
 Kconfig                                        | 10 ----------
 recipes-kernel/linux/linux-xenomai-4_6.1.bb    | 14 --------------
 recipes-kernel/linux/linux-xenomai-4_6.12.bb   |  2 +-
 recipes-kernel/linux/linux-xenomai-4_6.18.bb   |  2 +-
 recipes-kernel/linux/linux-xenomai-4_latest.bb |  5 ++---
 5 files changed, 4 insertions(+), 29 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-xenomai-4_6.1.bb

diff --git a/Kconfig b/Kconfig
index dc79700..091a299 100644
--- a/Kconfig
+++ b/Kconfig
@@ -228,14 +228,6 @@ config EVL_KERNEL_6_12
 	bool "Latest 6.12 EVL release"
 	depends on !ARCH_RISCV64
 
-config EVL_KERNEL_6_1_HEAD
-	bool "Head of 6.1 EVL branch"
-	depends on !ARCH_RISCV64
-
-config EVL_KERNEL_6_1
-	bool "Latest 6.1 EVL release"
-	depends on !ARCH_RISCV64
-
 endchoice
 
 config KAS_INCLUDE_EVL_KERNEL
@@ -245,8 +237,6 @@ config KAS_INCLUDE_EVL_KERNEL
 	default "kas/opt/linux-6.18.yaml" if EVL_KERNEL_6_18
 	default "kas/opt/linux-6.12-head.yaml" if EVL_KERNEL_6_12_HEAD
 	default "kas/opt/linux-6.12.yaml" if EVL_KERNEL_6_12
-	default "kas/opt/linux-6.1-head.yaml" if EVL_KERNEL_6_1_HEAD
-	default "kas/opt/linux-6.1.yaml" if EVL_KERNEL_6_1
 
 choice
 	prompt "libevl version"
diff --git a/recipes-kernel/linux/linux-xenomai-4_6.1.bb b/recipes-kernel/linux/linux-xenomai-4_6.1.bb
deleted file mode 100644
index 2efe538..0000000
--- a/recipes-kernel/linux/linux-xenomai-4_6.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Xenomai Real-Time System
-#
-# Copyright (c) Siemens AG, 2023-2026
-#
-# Authors:
-#  Clara Kowalsky <[email protected]>
-#
-# SPDX-License-Identifier: MIT
-#
-
-require recipes-kernel/linux/linux-xenomai-4-evl.inc
-
-SRCREV ?= "v6.1.162-cip51-evl2-rebase"
diff --git a/recipes-kernel/linux/linux-xenomai-4_6.12.bb b/recipes-kernel/linux/linux-xenomai-4_6.12.bb
index 7281917..249b485 100644
--- a/recipes-kernel/linux/linux-xenomai-4_6.12.bb
+++ b/recipes-kernel/linux/linux-xenomai-4_6.12.bb
@@ -11,4 +11,4 @@
 
 require recipes-kernel/linux/linux-xenomai-4-evl.inc
 
-SRCREV ?= "v6.12.69-cip17-evl1-rebase"
+SRCREV ?= "v6.12.85-cip22-evl4-rebase"
diff --git a/recipes-kernel/linux/linux-xenomai-4_6.18.bb b/recipes-kernel/linux/linux-xenomai-4_6.18.bb
index a1ddad5..10fe5f9 100644
--- a/recipes-kernel/linux/linux-xenomai-4_6.18.bb
+++ b/recipes-kernel/linux/linux-xenomai-4_6.18.bb
@@ -11,4 +11,4 @@
 
 require recipes-kernel/linux/linux-xenomai-4-evl.inc
 
-SRCREV ?= "v6.18.7-evl2-rebase"
+SRCREV ?= "v6.18.22-evl5-rebase"
diff --git a/recipes-kernel/linux/linux-xenomai-4_latest.bb b/recipes-kernel/linux/linux-xenomai-4_latest.bb
index 9d479cd..a542e80 100644
--- a/recipes-kernel/linux/linux-xenomai-4_latest.bb
+++ b/recipes-kernel/linux/linux-xenomai-4_latest.bb
@@ -27,12 +27,11 @@ python () {
         (ret, out) = subprocess.getstatusoutput(cmd)
         d.setVar('LATEST_KERNEL_BRANCH', out)
     else:
-        d.setVar('LATEST_KERNEL_BRANCH', 'v6.12.y-evl-rebase')
+        d.setVar('LATEST_KERNEL_BRANCH', 'v6.18.y-evl-rebase')
 }
 
 GIT_BRANCH = "${@ \
-    'v6.1.y-cip-evl-rebase' if is_kernel(d, '6.1') \
-    else 'v6.12.y-cip-evl-rebase' if is_kernel(d, '6.12') \
+    'v6.12.y-cip-evl-rebase' if is_kernel(d, '6.12') \
     else 'v6.18.y-evl-rebase' if is_kernel(d, '6.18') \
     else d.getVar('LATEST_KERNEL_BRANCH') }"
 GIT_BRANCH:riscv64 = "wip/evl-riscv"
-- 
2.47.3