diff mbox series

[isar-cip-core] linux-cip: Switch to 6.1-cip release

Message ID 00856a85-3d39-cb39-d8a9-e86e257ef4ed@siemens.com (mailing list archive)
State Accepted
Headers show
Series [isar-cip-core] linux-cip: Switch to 6.1-cip release | expand

Commit Message

Jan Kiszka July 18, 2023, 7:32 p.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

We have now an official CIP kernel for 6.1, so switch over from the
mainline recipe. Also switch bookworm builds to 6.1-cip by default.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 Kconfig                                       |  9 ++++-----
 conf/distro/cip-core-bookworm.conf            |  4 ++--
 kas/opt/{6.1-mainline.yml => 6.1.yml}         |  3 ++-
 .../linux/linux-cip-rt_6.1.38-cip1-rt1.bb     | 12 ++++++++++++
 recipes-kernel/linux/linux-cip_6.1.38-cip1.bb | 12 ++++++++++++
 recipes-kernel/linux/linux-mainline_6.1.15.bb | 19 -------------------
 6 files changed, 32 insertions(+), 27 deletions(-)
 rename kas/opt/{6.1-mainline.yml => 6.1.yml} (72%)
 create mode 100644 recipes-kernel/linux/linux-cip-rt_6.1.38-cip1-rt1.bb
 create mode 100644 recipes-kernel/linux/linux-cip_6.1.38-cip1.bb
 delete mode 100644 recipes-kernel/linux/linux-mainline_6.1.15.bb
diff mbox series

Patch

diff --git a/Kconfig b/Kconfig
index 94e807a1..ec49631e 100644
--- a/Kconfig
+++ b/Kconfig
@@ -97,8 +97,8 @@  config KERNEL_4_19
 config KERNEL_5_10
 	bool "Kernel 5.10.x-cip"
 
-config KERNEL_6_1_MAINLINE
-	bool "Kernel 6.1.x-mainline"
+config KERNEL_6_1
+	bool "Kernel 6.1.x-cip"
 
 endchoice
 
@@ -107,12 +107,11 @@  config KAS_INCLUDE_KERNEL
 	default "kas/opt/4.4.yml" if KERNEL_4_4
 	default "kas/opt/4.19.yml" if KERNEL_4_19
 	default "kas/opt/5.10.yml" if KERNEL_5_10
-	default "kas/opt/6.1-mainline.yml" if KERNEL_6_1_MAINLINE
+	default "kas/opt/6.1.yml" if KERNEL_6_1
 
 config KERNEL_RT
 	bool "Real-time CIP kernel"
 	depends on !ARCH_RISCV64
-	depends on !KERNEL_6_1_MAINLINE
 
 config KAS_INCLUDE_KERNEL_RT
 	string
@@ -187,7 +186,7 @@  if IMAGE_FLASH && !KERNEL_4_4 && !KERNEL_4_19
 
 config IMAGE_SWUPDATE
 	bool "SWUpdate support for root partition"
-	depends on TARGET_QEMU_AMD64 || TARGET_SIMATIC_IPC227E || TARGET_QEMU_ARM64 || TARGET_QEMU_ARM || TARGET_BBB || ( TARGET_QEMU_RISCV64 && KERNEL_6_1_MAINLINE ) || TARGET_HIHOPE_RZG2M
+	depends on TARGET_QEMU_AMD64 || TARGET_SIMATIC_IPC227E || TARGET_QEMU_ARM64 || TARGET_QEMU_ARM || TARGET_BBB || ( TARGET_QEMU_RISCV64 && KERNEL_6_1 ) || TARGET_HIHOPE_RZG2M
 
 config IMAGE_SECURE_BOOT
 	bool "Secure boot support"
diff --git a/conf/distro/cip-core-bookworm.conf b/conf/distro/cip-core-bookworm.conf
index adafc92e..9bcf5593 100644
--- a/conf/distro/cip-core-bookworm.conf
+++ b/conf/distro/cip-core-bookworm.conf
@@ -13,5 +13,5 @@  require conf/distro/debian-bookworm.conf
 require cip-core-common.inc
 
 PREFERRED_VERSION_swupdate ?= "2023.05%"
-PREFERRED_VERSION_linux-cip ?= "5.10.%"
-PREFERRED_VERSION_linux-cip-rt ?= "5.10.%"
+PREFERRED_VERSION_linux-cip ?= "6.1.%"
+PREFERRED_VERSION_linux-cip-rt ?= "6.1.%"
diff --git a/kas/opt/6.1-mainline.yml b/kas/opt/6.1.yml
similarity index 72%
rename from kas/opt/6.1-mainline.yml
rename to kas/opt/6.1.yml
index 0dcf3364..ac12adff 100644
--- a/kas/opt/6.1-mainline.yml
+++ b/kas/opt/6.1.yml
@@ -14,4 +14,5 @@  header:
 
 local_conf_header:
   kernel-version: |
-    KERNEL_NAME = "mainline"
+    PREFERRED_VERSION_linux-cip = "6.1.%"
+    PREFERRED_VERSION_linux-cip-rt = "6.1.%"
diff --git a/recipes-kernel/linux/linux-cip-rt_6.1.38-cip1-rt1.bb b/recipes-kernel/linux/linux-cip-rt_6.1.38-cip1-rt1.bb
new file mode 100644
index 00000000..a1ba50a9
--- /dev/null
+++ b/recipes-kernel/linux/linux-cip-rt_6.1.38-cip1-rt1.bb
@@ -0,0 +1,12 @@ 
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2023
+#
+# SPDX-License-Identifier: MIT
+
+require linux-cip-common.inc
+
+KERNEL_DEFCONFIG_VERSION ?= "6.1.y-cip"
+
+SRC_URI[sha256sum] = "5e4dd386aa8a4cce341b8efeec76320feed53770ead67c838ffb321edd47b157"
diff --git a/recipes-kernel/linux/linux-cip_6.1.38-cip1.bb b/recipes-kernel/linux/linux-cip_6.1.38-cip1.bb
new file mode 100644
index 00000000..417de504
--- /dev/null
+++ b/recipes-kernel/linux/linux-cip_6.1.38-cip1.bb
@@ -0,0 +1,12 @@ 
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2023
+#
+# SPDX-License-Identifier: MIT
+
+require linux-cip-common.inc
+
+KERNEL_DEFCONFIG_VERSION ?= "6.1.y-cip"
+
+SRC_URI[sha256sum] = "188c2ee35a13058858d71aa9121ad9f75c3834126bd93d019ab1687ce0027aa7"
diff --git a/recipes-kernel/linux/linux-mainline_6.1.15.bb b/recipes-kernel/linux/linux-mainline_6.1.15.bb
deleted file mode 100644
index 9b45f28e..00000000
--- a/recipes-kernel/linux/linux-mainline_6.1.15.bb
+++ /dev/null
@@ -1,19 +0,0 @@ 
-# CIP Core, generic profile
-#
-# Copyright (c) Siemens AG, 2018-2023
-#
-# SPDX-License-Identifier: MIT
-
-require recipes-kernel/linux/linux-custom.inc
-require recipes-kernel/linux/cip-kernel-config.inc
-
-ARCHIVE_VERSION = "${@ d.getVar('PV')[:-2] if d.getVar('PV').endswith('.0') else d.getVar('PV') }"
-
-KERNEL_DEFCONFIG_VERSION ?= "6.1.y-cip"
-
-SRC_URI += " \
-    https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${ARCHIVE_VERSION}.tar.xz"
-
-SRC_URI[sha256sum] = "2c16dfe2168a2e64ac0d55a12d625ebfb963818bb48b60c1868c7c460644c4fd"
-
-S = "${WORKDIR}/linux-${ARCHIVE_VERSION}"