Skip to contentSkip to conversation

Add stable/v3.3.x branch, version updates, fix for evl kernel selection

PATCH New Jan Kiszka 1 participant 8 messages Apr 10, 2025 Arm/Amlogic Meson SoC support

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

cover Add stable/v3.3.x branch, version updates, fix for evl kernel selection

See patches for details.

Jan

Jan Kiszka (7):
Add stable 3.3 branch with kernel 6.12 as default
ci: Add coverage for stable/v3.3.x branch
libevl: Update to latest release r50
linux-xenomai-4: Update to latest releases
linux-xenomai-3: Update to latest releases
linux-xenomai4: Enable selection of latest releases
Kconfig: Add 6.12 kernel option for EVL

 .gitlab-ci.yml                                |  8 +++-
 Kconfig                                       | 12 ++++++
 ci/xenomai_3_3_x.yml                          | 23 +++++++++++
 ci/xenomai_3_3_x_compat.yml                   | 18 +++++++++
 conf/distro/include/xenomai-version.inc       | 12 ++++--
 opt-linux-6.1.yml                             |  1 +
 opt-linux-6.12.yml                            |  1 +
 opt-linux-6.6.yml                             |  1 +
 opt-linux-6.12.yml => opt-xenomai-3.3.x.yml   |  7 ++--
 recipes-kernel/linux/linux-xenomai-3_5.10.bb  |  2 +-
 recipes-kernel/linux/linux-xenomai-3_5.15.bb  |  2 +-
 recipes-kernel/linux/linux-xenomai-3_6.1.bb   |  2 +-
 recipes-kernel/linux/linux-xenomai-3_6.12.bb  |  2 +-
 recipes-kernel/linux/linux-xenomai-4_6.1.bb   |  2 +-
 recipes-kernel/linux/linux-xenomai-4_6.12.bb  |  2 +-
 ...i-Take-Debian-multiarch-into-account.patch | 40 -------------------
 .../libevl/{libevl_47.bb => libevl_50.bb}     |  1 -
 .../xenomai/xenomai_stable-3.3.x.bb           |  1 +
 18 files changed, 83 insertions(+), 54 deletions(-)
 create mode 100644 ci/xenomai_3_3_x.yml
 create mode 100644 ci/xenomai_3_3_x_compat.yml
 copy opt-linux-6.12.yml => opt-xenomai-3.3.x.yml (51%)
 delete mode 100644 recipes-xenomai/libevl/files/0001-meson-setup-uapi-Take-Debian-multiarch-into-account.patch
 rename recipes-xenomai/libevl/{libevl_47.bb => libevl_50.bb} (77%)
 create mode 120000 recipes-xenomai/xenomai/xenomai_stable-3.3.x.bb
Signature · 1 line
2.43.0
author
#1 lore raw

PATCH 1/7 Add stable 3.3 branch with kernel 6.12 as default

From: Jan Kiszka <[email protected]>

---
 Kconfig                                        |  4 ++++
 conf/distro/include/xenomai-version.inc        | 12 +++++++++---
 opt-xenomai-3.3.x.yml                          | 18 ++++++++++++++++++
 .../xenomai/xenomai_stable-3.3.x.bb            |  1 +
 4 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 opt-xenomai-3.3.x.yml
 create mode 120000 recipes-xenomai/xenomai/xenomai_stable-3.3.x.bb
Kconfig +4 -0
index 5aa06bd..f7ac3c8 100644
@@ -82,6 +82,9 @@ choice
 config XENOMAI_LATEST
 	bool "Head of next branch"
 
+config XENOMAI_3_3_LATEST
+	bool "Head of stable/v3.3.x branch"
+
 config XENOMAI_3_3
 	bool "Latest 3.3.x release"
 
@@ -104,6 +107,7 @@ endchoice
 config KAS_INCLUDE_XENOMAI
 	string
 	default "opt-xenomai-next.yml" if XENOMAI_LATEST
+	default "opt-xenomai-3.3.x.yml" if XENOMAI_3_3_LATEST
 	default "opt-xenomai-3.2.x.yml" if XENOMAI_3_2_LATEST
 	default "opt-xenomai-3.1.x.yml" if XENOMAI_3_1_LATEST
 	default "opt-xenomai-3.0.x.yml" if XENOMAI_3_0_LATEST
conf/distro/include/xenomai-version.inc +9 -3
index e036c39..81c61ac 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]>
@@ -9,7 +9,7 @@
 # SPDX-License-Identifier: MIT
 #
 
-XENOMAI_DEFAULT_KERNEL_VERSION = "6.1%"
+XENOMAI_DEFAULT_KERNEL_VERSION = "6.12%"
 
 XENOMAI_3_0_VERSION_LIST = "3.0 3.0% 3.0.% 3.0.15 stable-3.0.x"
 XENOMAI_3_0_KERNEL_VERSION = "4.4%"
@@ -20,6 +20,9 @@ XENOMAI_3_1_KERNEL_VERSION = "5.4%"
 XENOMAI_3_2_VERSION_LIST = "3.2 3.2% 3.2.% 3.2.6 stable-3.2.x"
 XENOMAI_3_2_KERNEL_VERSION = "6.1%"
 
+XENOMAI_3_3_VERSION_LIST = "3.3 3.3% 3.3.% stable-3.2.x"
+XENOMAI_3_3_KERNEL_VERSION = "6.12%"
+
 # If PREFERRED_VERSION_xenomai contains any item from XENOMAI_3_0_VERSION_LIST use
 # XENOMAI_3_0_KERNEL_VERSION. Same for the other XENOMAI_*_VERSION_LIST.
 PREFERRED_VERSION_linux-xenomai-3 ?= \
@@ -29,6 +32,9 @@ PREFERRED_VERSION_linux-xenomai-3 ?= \
             '${XENOMAI_3_1_VERSION_LIST}', '${XENOMAI_3_1_KERNEL_VERSION}', \
             bb.utils.contains_any('PREFERRED_VERSION_xenomai', \
                 '${XENOMAI_3_2_VERSION_LIST}', '${XENOMAI_3_2_KERNEL_VERSION}', \
-                '${XENOMAI_DEFAULT_KERNEL_VERSION}', d), \
+                bb.utils.contains_any('PREFERRED_VERSION_xenomai', \
+                    '${XENOMAI_3_3_VERSION_LIST}', '${XENOMAI_3_3_KERNEL_VERSION}', \
+                    '${XENOMAI_DEFAULT_KERNEL_VERSION}', d), \
+                d), \
             d), \
         d)}"
opt-xenomai-3.3.x.yml new file +18 -0
new file mode 100644
index 0000000..cd7b477
@@ -0,0 +1,18 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens, 2025
+#
+# Authors:
+#  Jan Kiszka <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+  version: 14
+
+local_conf_header:
+  xenomai-3-3-x: |
+    PREFERRED_VERSION_xenomai = "stable-3.3.x"
+    PREFERRED_VERSION_xenomai-compat = "stable-3.3.x"
recipes-xenomai/xenomai/xenomai_stable-3.3.x.bb new file +1 -0
new file mode 120000
index 0000000..0914c52
@@ -0,0 +1 @@
+xenomai_stable-3.0.x.bb
\ No newline at end of file
Signature · 1 line
2.43.0
author
#2 lore raw

PATCH 2/7 ci: Add coverage for stable/v3.3.x branch

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

At this stage, we just copy the targets from next. They will likely be reduced over the time.

---
 .gitlab-ci.yml              |  8 +++++++-
 ci/xenomai_3_3_x.yml        | 23 +++++++++++++++++++++++
 ci/xenomai_3_3_x_compat.yml | 18 ++++++++++++++++++
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 ci/xenomai_3_3_x.yml
 create mode 100644 ci/xenomai_3_3_x_compat.yml
.gitlab-ci.yml +7 -1
index 6f9bcd6..7a6c6a9 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]>
@@ -46,6 +46,12 @@ stable/v3.2.x:
     include:
       - local: '/ci/xenomai_3_2_x.yml'
 
+stable/v3.3.x:
+  extends: .parent
+  trigger:
+    include:
+      - local: '/ci/xenomai_3_3_x.yml'
+
 xenomai-3/next:
   extends: .parent
   trigger:
ci/xenomai_3_3_x.yml new file +23 -0
new file mode 100644
index 0000000..a8dfa29
@@ -0,0 +1,23 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2019-2025
+#
+# Authors:
+#  Quirin Gylstorff <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+include:
+  - local: '/ci/gitlab-ci-base.yml'
+  - local: '/ci/kernel_5_10.yml'
+  - local: '/ci/kernel_5_15.yml'
+  - local: '/ci/kernel_6_1.yml'
+  - local: '/ci/kernel_6_12.yml'
+  - local: '/ci/xenomai_3_next_compat.yml'
+
+variables:
+  XENOMAI_BUILD_OPTION: ":opt-xenomai-3.3.x.yml:opt-debug.yml"
+  XENOMAI_VERSION: "3.3.x"
+  LATEST_KERNEL_VERSION: "6.12"
ci/xenomai_3_3_x_compat.yml new file +18 -0
new file mode 100644
index 0000000..5f64fed
@@ -0,0 +1,18 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2025
+#
+# Authors:
+#  Jan Kiszka <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+.compat-vars:
+  variables:
+    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.3.x.yml:opt-debug.yml:opt-compat.yml"
+    XENOMAI_VERSION: "3_3_x-compat"
+
+include:
+  - local: '/ci/compat_jobs.yml'
Signature · 1 line
2.43.0
author
#3 lore raw

PATCH 3/7 libevl: Update to latest release r50

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

Allows to drop a locally carried patch.

---
 ...i-Take-Debian-multiarch-into-account.patch | 40 -------------------
 .../libevl/{libevl_47.bb => libevl_50.bb}     |  1 -
 2 files changed, 41 deletions(-)
 delete mode 100644 recipes-xenomai/libevl/files/0001-meson-setup-uapi-Take-Debian-multiarch-into-account.patch
 rename recipes-xenomai/libevl/{libevl_47.bb => libevl_50.bb} (77%)
recipes-xenomai/libevl/files/0001-meson-setup-uapi-Take-Debian-multiarch-into-account.patch deleted +0 -40
deleted file mode 100644
index 3c1f48c..0000000
@@ -1,40 +0,0 @@
-From b4447250c7fff6940c1bb6f0308da617bebaa643 Mon Sep 17 00:00:00 2001
-From: Jan Kiszka <[email protected]>
-Date: Tue, 2 Jan 2024 14:01:19 +0100
-Subject: [PATCH] meson: setup-uapi: Take Debian multiarch into account
-
-Check also the Debian multiarch include path for the chosen architecture
-so that we can support (self-built) linux-libc-dev packages that contain
-the evl headers.
-
-Signed-off-by: Jan Kiszka <[email protected]>
----
- meson/setup-uapi.sh | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/meson/setup-uapi.sh b/meson/setup-uapi.sh
-index f2d0774..633c5ed 100644
---- a/meson/setup-uapi.sh
-+++ b/meson/setup-uapi.sh
-@@ -17,7 +17,17 @@ if test -r $UAPI/Kbuild; then
-     link_dir $UAPI/arch/$ARCH/include/uapi/asm/evl asm
-     link_dir $UAPI/include/uapi/asm-generic .
- else
-+    DEB_HOST_ARCH=$ARCH
-+    if [ "$DEB_HOST_ARCH" = "x86" ]; then
-+        DEB_HOST_ARCH=amd64
-+    fi
-+    DEB_HOST_MULTIARCH=$( \
-+        dpkg-architecture -q DEB_HOST_MULTIARCH -a $DEB_HOST_ARCH 2>/dev/null)
-     link_dir $UAPI/evl .
--    link_dir $UAPI/asm/evl asm
-+    if [ -d $UAPI/$DEB_HOST_MULTIARCH/asm/evl ]; then
-+        link_dir $UAPI/$DEB_HOST_MULTIARCH/asm/evl asm
-+    else
-+        link_dir $UAPI/asm/evl asm
-+    fi
-     link_dir $UAPI/asm-generic .
- fi
--- 
-2.35.3
-
recipes-xenomai/libevl/libevl_50.bb renamed from recipes-xenomai/libevl/libevl_47.bb +0 -1
similarity index 77%
rename from recipes-xenomai/libevl/libevl_47.bb
rename to recipes-xenomai/libevl/libevl_50.bb
index 1d93e1d..26bcc2e 100644
@@ -12,4 +12,3 @@
 require libevl.inc
 
 SRC_URI += "git://source.denx.de/Xenomai/xenomai4/libevl.git;protocol=https;branch=master;tag=r${PV}"
-SRC_URI += "file://0001-meson-setup-uapi-Take-Debian-multiarch-into-account.patch"
Signature · 1 line
2.43.0
author
#4 lore raw

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

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

---
 recipes-kernel/linux/linux-xenomai-4_6.1.bb  | 2 +-
 recipes-kernel/linux/linux-xenomai-4_6.12.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
recipes-kernel/linux/linux-xenomai-4_6.1.bb +1 -1
index 32e2131..1571ab6 100644
@@ -11,4 +11,4 @@
 
 require recipes-kernel/linux/linux-xenomai-4-evl.inc
 
-SRCREV ?= "v6.1.121-cip34-evl1-rebase"
+SRCREV ?= "v6.1.128-cip37-evl1-rebase"
recipes-kernel/linux/linux-xenomai-4_6.12.bb +1 -1
index 75fa7ee..3e042a5 100644
@@ -11,4 +11,4 @@
 
 require recipes-kernel/linux/linux-xenomai-4-evl.inc
 
-SRCREV ?= "v6.12.8-evl1-rebase"
+SRCREV ?= "v6.12.19-evl1-rebase"
Signature · 1 line
2.43.0
author
#5 lore raw

PATCH 5/7 linux-xenomai-3: Update to latest releases

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

---
 recipes-kernel/linux/linux-xenomai-3_5.10.bb | 2 +-
 recipes-kernel/linux/linux-xenomai-3_5.15.bb | 2 +-
 recipes-kernel/linux/linux-xenomai-3_6.1.bb  | 2 +-
 recipes-kernel/linux/linux-xenomai-3_6.12.bb | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
recipes-kernel/linux/linux-xenomai-3_5.10.bb +1 -1
index 088d0d8..644f001 100644
@@ -11,4 +11,4 @@
 
 require recipes-kernel/linux/linux-xenomai-3-dovetail.inc
 
-SRCREV ?= "v5.10.229-cip54-dovetail1"
+SRCREV ?= "v5.10.234-cip57-dovetail1"
recipes-kernel/linux/linux-xenomai-3_5.15.bb +1 -1
index 286c64e..14dca06 100644
@@ -11,4 +11,4 @@
 
 require recipes-kernel/linux/linux-xenomai-3-dovetail.inc
 
-SRCREV ?= "v5.15.173-dovetail1"
+SRCREV ?= "v5.15.179-dovetail1"
recipes-kernel/linux/linux-xenomai-3_6.1.bb +1 -1
index f052b20..03b3800 100644
@@ -11,4 +11,4 @@
 
 require recipes-kernel/linux/linux-xenomai-3-dovetail.inc
 
-SRCREV ?= "v6.1.121-cip34-dovetail1"
+SRCREV ?= "v6.1.128-cip37-dovetail1"
recipes-kernel/linux/linux-xenomai-3_6.12.bb +1 -1
index 62fbe67..505aac4 100644
@@ -11,4 +11,4 @@
 
 require recipes-kernel/linux/linux-xenomai-3-dovetail.inc
 
-SRCREV ?= "v6.12.8-dovetail1"
+SRCREV ?= "v6.12.19-dovetail1"
Signature · 1 line
2.43.0
author
#6 lore raw

PATCH 6/7 linux-xenomai4: Enable selection of latest releases

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

Analogously to linux-xenomai-3, we need to set the preferred versions for linux-xenomai-4 in order to allow their selection via kas.

---
 opt-linux-6.1.yml  | 1 +
 opt-linux-6.12.yml | 1 +
 opt-linux-6.6.yml  | 1 +
 3 files changed, 3 insertions(+)
opt-linux-6.1.yml +1 -0
index 76c2a8b..b1073c0 100644
@@ -15,3 +15,4 @@ header:
 local_conf_header:
   linux-xenomai-version: |
     PREFERRED_VERSION_linux-xenomai-3 = "6.1%"
+    PREFERRED_VERSION_linux-xenomai-4 = "6.1%"
opt-linux-6.12.yml +1 -0
index 8132364..b026467 100644
@@ -15,3 +15,4 @@ header:
 local_conf_header:
   linux-xenomai-version: |
     PREFERRED_VERSION_linux-xenomai-3 = "6.12%"
+    PREFERRED_VERSION_linux-xenomai-4 = "6.12%"
opt-linux-6.6.yml +1 -0
index 1b0bbb4..0de37f8 100644
@@ -15,3 +15,4 @@ header:
 local_conf_header:
   linux-xenomai-version: |
     PREFERRED_VERSION_linux-xenomai-3 = "6.6%"
+    PREFERRED_VERSION_linux-xenomai-4 = "6.6%"
Signature · 1 line
2.43.0
author
#7 lore raw

PATCH 7/7 Kconfig: Add 6.12 kernel option for EVL

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

---
 Kconfig | 8 ++++++++
 1 file changed, 8 insertions(+)
Kconfig +8 -0
index f7ac3c8..042be93 100644
@@ -242,6 +242,12 @@ choice
 config EVL_KERNEL_LATEST
 	bool "Head of latest EVL branch"
 
+config EVL_KERNEL_6_12_LATEST
+	bool "Head of 6.12 EVL branch"
+
+config EVL_KERNEL_6_12
+	bool "Latest 6.12 EVL release"
+
 config EVL_KERNEL_6_6_LATEST
 	bool "Head of 6.6 EVL branch"
 
@@ -259,6 +265,8 @@ endchoice
 config KAS_INCLUDE_EVL_KERNEL
 	string
 	default "opt-linux-latest.yml" if EVL_KERNEL_LATEST
+	default "opt-linux-latest-6.12.yml" if EVL_KERNEL_6_12_LATEST
+	default "opt-linux-6.12.yml" if EVL_KERNEL_6_12
 	default "opt-linux-latest-6.6.yml" if EVL_KERNEL_6_6_LATEST
 	default "opt-linux-6.6.yml" if EVL_KERNEL_6_6
 	default "opt-linux-latest-6.1.yml" if EVL_KERNEL_6_1_LATEST
Signature · 1 line
2.43.0