[xenomai-images][PATCH] linux-xenomai: Switch 6.12 latest to new cip branches

Jan Kiszka <[email protected]>
Newsgroups dev.linux.lists.xenomai
Message-ID <[email protected]>
From: Jan Kiszka <[email protected]>

Kernel 6.12 for both dovetail and evl is switching to a CIP baseline.
Adjust our build accordingly.

Signed-off-by: Jan Kiszka <[email protected]>
---
 recipes-kernel/linux/linux-xenomai-3_latest.bb | 6 +++---
 recipes-kernel/linux/linux-xenomai-4_latest.bb | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes-kernel/linux/linux-xenomai-3_latest.bb b/recipes-kernel/linux/linux-xenomai-3_latest.bb
index 9c348fe..0a68d11 100644
--- a/recipes-kernel/linux/linux-xenomai-3_latest.bb
+++ b/recipes-kernel/linux/linux-xenomai-3_latest.bb
@@ -40,7 +40,7 @@ GIT_BRANCH = "${@ \
     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-cip-dovetail-rebase' if is_kernel(d, '6.1') \
-    else 'v6.12.y-dovetail-rebase' if is_kernel(d, '6.12') \
+    else 'v6.12.y-cip-dovetail-rebase' if is_kernel(d, '6.12') \
     else d.getVar('LATEST_KERNEL_BRANCH') }"
 
 GIT_REPO:armhf = "${@ \
@@ -51,7 +51,7 @@ GIT_BRANCH:armhf = "${@ \
     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-cip-dovetail-rebase' if is_kernel(d, '6.1') \
-    else 'v6.12.y-dovetail-rebase' if is_kernel(d, '6.12') \
+    else 'v6.12.y-cip-dovetail-rebase' if is_kernel(d, '6.12') \
     else d.getVar('LATEST_KERNEL_BRANCH') }"
 
 GIT_REPO:arm64 = "${@ \
@@ -62,7 +62,7 @@ GIT_BRANCH:arm64 = "${@ \
     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-cip-dovetail-rebase' if is_kernel(d, '6.1') \
-    else 'v6.12.y-dovetail-rebase' if is_kernel(d, '6.12') \
+    else 'v6.12.y-cip-dovetail-rebase' if is_kernel(d, '6.12') \
     else d.getVar('LATEST_KERNEL_BRANCH') }"
 
 SRC_URI += "${GIT_REPO};protocol=https;branch=${GIT_BRANCH}"
diff --git a/recipes-kernel/linux/linux-xenomai-4_latest.bb b/recipes-kernel/linux/linux-xenomai-4_latest.bb
index ed49555..20fa03f 100644
--- a/recipes-kernel/linux/linux-xenomai-4_latest.bb
+++ b/recipes-kernel/linux/linux-xenomai-4_latest.bb
@@ -32,7 +32,7 @@ python () {
 
 GIT_BRANCH = "${@ \
     'v6.1.y-cip-evl-rebase' if is_kernel(d, '6.1') \
-    else 'v6.12.y-evl-rebase' if is_kernel(d, '6.12') \
+    else 'v6.12.y-cip-evl-rebase' if is_kernel(d, '6.12') \
     else d.getVar('LATEST_KERNEL_BRANCH') }"
 GIT_BRANCH:riscv64 = "wip/evl-riscv"
 
-- 
2.47.3
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.