All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] linux: bump CIP kernel to version 6.12.114-cip34
@ 2026-11-04 21:32 Angelo Compagnucci
  2026-11-04 22:33 ` Thomas Petazzoni via buildroot
  0 siblings, 1 reply; 2+ messages in thread
From: Angelo Compagnucci @ 2026-11-04 21:32 UTC (permalink / raw)
  To: buildroot; +Cc: Bernd Kuhls, Angelo Compagnucci

Move the CIP SLTS option from the 5.10 series to 6.12, the latest CIP
SLTS kernel.

CIP does not provide a separate real-time kernel for its 6.12 SLTS
series, as PREEMPT_RT is part of mainline Linux since 6.12: the CIP RT
releases stop at the 6.1 and 5.10 series. So remove the CIP RT option,
and point its users to the CIP kernel with CONFIG_PREEMPT_RT enabled.
The microblaze build fix only applied to the CIP RT kernel and goes
away with it.

Linux supports loongarch64 since 5.19, so the CIP option no longer
needs to exclude it.

Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
---
 Config.in.legacy                              | 10 +++++
 ...-arch-microblaze-mm-init.c-fix-build.patch | 37 -------------------
 linux/5.10.254-cip72-rt32/linux.hash          |  1 -
 linux/{5.10.254-cip72 => 6.12.114-cip34}      |  0
 linux/Config.ext.in                           |  1 -
 linux/Config.in                               | 28 ++++----------
 linux/before-6.17/linux.hash                  |  3 +-
 linux/linux.mk                                |  2 +-
 package/linux-headers/5.10.254-cip72-rt32     |  1 -
 .../{5.10.254-cip72 => 6.12.114-cip34}        |  0
 package/linux-headers/linux-headers.mk        |  2 +-
 11 files changed, 20 insertions(+), 65 deletions(-)
 delete mode 100644 linux/5.10.254-cip72-rt32/0001-arch-microblaze-mm-init.c-fix-build.patch
 delete mode 120000 linux/5.10.254-cip72-rt32/linux.hash
 rename linux/{5.10.254-cip72 => 6.12.114-cip34} (100%)
 delete mode 120000 package/linux-headers/5.10.254-cip72-rt32
 rename package/linux-headers/{5.10.254-cip72 => 6.12.114-cip34} (100%)

diff --git a/Config.in.legacy b/Config.in.legacy
index a238369785..970b587a94 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,16 @@ endif
 
 comment "Legacy options removed in 2026.11"
 
+config BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
+	bool "Latest CIP RT SLTS version has been removed"
+	select BR2_LEGACY
+	help
+	  The CIP RT SLTS kernel option has been removed. CIP does not
+	  provide a separate real-time kernel for its 6.12 SLTS series,
+	  as PREEMPT_RT is part of mainline Linux since 6.12. Use the
+	  latest CIP SLTS version and enable CONFIG_PREEMPT_RT in the
+	  kernel configuration instead.
+
 config BR2_PACKAGE_HTPDATE
 	bool "htpdate has been removed"
 	select BR2_LEGACY
diff --git a/linux/5.10.254-cip72-rt32/0001-arch-microblaze-mm-init.c-fix-build.patch b/linux/5.10.254-cip72-rt32/0001-arch-microblaze-mm-init.c-fix-build.patch
deleted file mode 100644
index d1124f4cda..0000000000
--- a/linux/5.10.254-cip72-rt32/0001-arch-microblaze-mm-init.c-fix-build.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 1fc03e1fdc8bb606d1c95e9fa557a9e5f6df17ec Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sat, 25 Feb 2023 17:26:56 +0100
-Subject: [PATCH] arch/microblaze/mm/init.c: fix build
-
-Fix the following build failure on microblaze raised since
-https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/commit/arch/microblaze/mm/init.c?h=v5.10.168-cip27-rt11&id=32ac92b5a39e2ef91308929bf5ed0804094b4183:
-
-arch/microblaze/mm/init.c:71:2: error: #endif without #if
-   71 | #endif /* CONFIG_HIGHMEM */
-      |  ^~~~~
-
-Fixes:
- - http://autobuild.buildroot.org/results/27291870cf7539d26e45c45f34322d24a6dbca33
-
-Upstream: sent to Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- arch/microblaze/mm/init.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c
-index 1f4b5b34e600..a444778e59de 100644
---- a/arch/microblaze/mm/init.c
-+++ b/arch/microblaze/mm/init.c
-@@ -49,6 +49,7 @@ unsigned long lowmem_size;
- EXPORT_SYMBOL(min_low_pfn);
- EXPORT_SYMBOL(max_low_pfn);
- 
-+#ifdef CONFIG_HIGHMEM
- static void __init highmem_init(void)
- {
- 	pr_debug("%x\n", (u32)PKMAP_BASE);
--- 
-2.39.1
-
diff --git a/linux/5.10.254-cip72-rt32/linux.hash b/linux/5.10.254-cip72-rt32/linux.hash
deleted file mode 120000
index cde5626c0a..0000000000
--- a/linux/5.10.254-cip72-rt32/linux.hash
+++ /dev/null
@@ -1 +0,0 @@
-../before-6.17/linux.hash
\ No newline at end of file
diff --git a/linux/5.10.254-cip72 b/linux/6.12.114-cip34
similarity index 100%
rename from linux/5.10.254-cip72
rename to linux/6.12.114-cip34
diff --git a/linux/Config.ext.in b/linux/Config.ext.in
index 3b72d3cf60..f598326121 100644
--- a/linux/Config.ext.in
+++ b/linux/Config.ext.in
@@ -50,7 +50,6 @@ config BR2_LINUX_KERNEL_EXT_RTAI
 	bool "RTAI Real-time patch"
 	depends on !BR2_LINUX_KERNEL_LATEST_VERSION
 	depends on !BR2_LINUX_KERNEL_LATEST_CIP_VERSION
-	depends on !BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
 	select BR2_PACKAGE_RTAI
 	help
 	  RTAI Kernel part.
diff --git a/linux/Config.in b/linux/Config.in
index ebd4287e48..4991eb7cba 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -74,10 +74,8 @@ config BR2_LINUX_KERNEL_LATEST_5_10
 	select BR2_LINUX_KERNEL_LATEST_SERIES
 
 config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
-	bool "Latest CIP SLTS version (5.10.254-cip72)"
-	# Support was introduced in Linux 5.19
-	depends on !BR2_loongarch64
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 if BR2_KERNEL_HEADERS_AS_KERNEL
+	bool "Latest CIP SLTS version (6.12.114-cip34)"
+	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_12 if BR2_KERNEL_HEADERS_AS_KERNEL
 	select BR2_LINUX_KERNEL_LATEST_SERIES
 	help
 	  CIP launched in the spring of 2016 to address the needs of
@@ -91,23 +89,12 @@ config BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	  implementation of software building blocks that meet
 	  these requirements.
 
-	  The CIP community plans to maintain 5.10 for security and
+	  The CIP community plans to maintain 6.12 for security and
 	  bug fixes for more than 10 years.
 
-	  https://www.cip-project.org
-
-config BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
-	bool "Latest CIP RT SLTS version (5.10.254-cip72-rt32)"
-	# Support was introduced in Linux 5.19
-	depends on !BR2_loongarch64
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_10 if BR2_KERNEL_HEADERS_AS_KERNEL
-	select BR2_LINUX_KERNEL_LATEST_SERIES
-	help
-	  Same as the CIP version, but this is the PREEMPT_RT realtime
-	  variant.
-
-	  The CIP community plans to maintain 5.10 for security and
-	  bug fixes for more than 10 years.
+	  CIP does not provide a separate real-time kernel for 6.12:
+	  PREEMPT_RT is part of mainline Linux since 6.12, enable
+	  CONFIG_PREEMPT_RT in the kernel configuration to use it.
 
 	  https://www.cip-project.org
 
@@ -189,8 +176,7 @@ config BR2_LINUX_KERNEL_VERSION
 	default "6.1.191" if BR2_LINUX_KERNEL_LATEST_6_1
 	default "5.15.224" if BR2_LINUX_KERNEL_LATEST_5_15
 	default "5.10.273" if BR2_LINUX_KERNEL_LATEST_5_10
-	default "5.10.254-cip72" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
-	default "5.10.254-cip72-rt32" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
+	default "6.12.114-cip34" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
 		if BR2_LINUX_KERNEL_CUSTOM_VERSION
 	default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL
diff --git a/linux/before-6.17/linux.hash b/linux/before-6.17/linux.hash
index eb8307fe8f..1dfc00d6df 100644
--- a/linux/before-6.17/linux.hash
+++ b/linux/before-6.17/linux.hash
@@ -6,8 +6,7 @@ sha256  02f15b77d213e15607923832ef9382e2414ea90df6c007f15a910e139645c35d  linux-
 sha256  2757f8ad099cf77499ebab0896b5d31a467b74d5bb18c32b62da059d33b30711  linux-5.15.224.tar.xz
 sha256  02ec2bcda2f6227fa69fd7a4e8cc04e6e948c9120932880663c6215b4632979d  linux-5.10.273.tar.xz
 # Locally computed
-sha256  bd5db7fe3b0475cce4fc72db7a7f7df1c22b970aabe5ebff6ddd48098973bdf2  linux-cip-5.10.254-cip72.tar.gz
-sha256  97d7d5139900c10ff7435779be4857dda531e7cf6abba52c12a5f39aae195411  linux-cip-5.10.254-cip72-rt32.tar.gz
+sha256  c4c21ee6722dd5d6a199099e5e68e2f0ef002c34e6e23ac0aa7ce92ba7710a8d  linux-cip-6.12.114-cip34.tar.gz
 
 # Licenses hashes
 sha256  fb5a425bd3b3cd6071a3a9aff9909a859e7c1158d54d32e07658398cd67eb6a0  COPYING
diff --git a/linux/linux.mk b/linux/linux.mk
index 75294cff18..49325a3a07 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -29,7 +29,7 @@ LINUX_SITE_METHOD = hg
 else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_SVN),y)
 LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL))
 LINUX_SITE_METHOD = svn
-else ifeq ($(BR2_LINUX_KERNEL_LATEST_CIP_VERSION)$(BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION),y)
+else ifeq ($(BR2_LINUX_KERNEL_LATEST_CIP_VERSION),y)
 LINUX_SOURCE = linux-cip-$(LINUX_VERSION).tar.gz
 LINUX_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot
 else ifneq ($(findstring -rc,$(LINUX_VERSION)),)
diff --git a/package/linux-headers/5.10.254-cip72-rt32 b/package/linux-headers/5.10.254-cip72-rt32
deleted file mode 120000
index 6bdea03c2e..0000000000
--- a/package/linux-headers/5.10.254-cip72-rt32
+++ /dev/null
@@ -1 +0,0 @@
-../../linux/before-6.17
\ No newline at end of file
diff --git a/package/linux-headers/5.10.254-cip72 b/package/linux-headers/6.12.114-cip34
similarity index 100%
rename from package/linux-headers/5.10.254-cip72
rename to package/linux-headers/6.12.114-cip34
diff --git a/package/linux-headers/linux-headers.mk b/package/linux-headers/linux-headers.mk
index ed37410ea6..4e697a96ac 100644
--- a/package/linux-headers/linux-headers.mk
+++ b/package/linux-headers/linux-headers.mk
@@ -17,7 +17,7 @@ LINUX_HEADERS_CUSTOM_SVN = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_SVN))
 LINUX_HEADERS_VERSION = $(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
 LINUX_HEADERS_CUSTOM_TARBALL_LOCATION = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION))
 LINUX_HEADERS_REPO_URL = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL))
-LINUX_HEADERS_CIP = $(BR2_LINUX_KERNEL_LATEST_CIP_VERSION)$(BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION)
+LINUX_HEADERS_CIP = $(BR2_LINUX_KERNEL_LATEST_CIP_VERSION)
 ifneq ($(LINUX_HEADERS_OVERRIDE_SRCDIR),)
 $(error LINUX_HEADERS_OVERRIDE_SRCDIR must not be set when BR2_KERNEL_HEADERS_AS_KERNEL=y)
 endif
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [Buildroot] [PATCH] linux: bump CIP kernel to version 6.12.114-cip34
  2026-11-04 21:32 [Buildroot] [PATCH] linux: bump CIP kernel to version 6.12.114-cip34 Angelo Compagnucci
@ 2026-11-04 22:33 ` Thomas Petazzoni via buildroot
  0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni via buildroot @ 2026-11-04 22:33 UTC (permalink / raw)
  To: Angelo Compagnucci; +Cc: buildroot, Bernd Kuhls

On Wed, Nov 04, 2026 at 10:32:24PM +0100, Angelo Compagnucci wrote:
> Move the CIP SLTS option from the 5.10 series to 6.12, the latest CIP
> SLTS kernel.
> 
> CIP does not provide a separate real-time kernel for its 6.12 SLTS
> series, as PREEMPT_RT is part of mainline Linux since 6.12: the CIP RT
> releases stop at the 6.1 and 5.10 series. So remove the CIP RT option,
> and point its users to the CIP kernel with CONFIG_PREEMPT_RT enabled.
> The microblaze build fix only applied to the CIP RT kernel and goes
> away with it.
> 
> Linux supports loongarch64 since 5.19, so the CIP option no longer
> needs to exclude it.
> 
> Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>

Applied to master, thanks!

Best regards,

Thomas Petazzoni
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-04 22:33 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-04 21:32 [Buildroot] [PATCH] linux: bump CIP kernel to version 6.12.114-cip34 Angelo Compagnucci
2026-11-04 22:33 ` Thomas Petazzoni via buildroot

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.