[isar-cip-core][PATCH 2/2] linux-cip: Add recipe, option file and menu entry for 5.10.83-cip1


Jan Kiszka
 

From: Jan Kiszka <jan.kiszka@...>

No -rt kernel released so far, thus we need to confine the choice when
5.10 is selected.

Signed-off-by: Jan Kiszka <jan.kiszka@...>
---
Kconfig | 7 ++++++-
conf/distro/cip-core-bullseye.conf | 2 +-
conf/distro/cip-core-bullseye.conf => kas/opt/5.10.yml | 10 ++++++----
.../linux/linux-cip_5.10.83-cip1.bb | 6 ++----
4 files changed, 15 insertions(+), 10 deletions(-)
copy conf/distro/cip-core-bullseye.conf => kas/opt/5.10.yml (50%)
copy conf/distro/cip-core-bullseye.conf => recipes-kernel/linux/linux-cip_5.10.83-cip1.bb (50%)

diff --git a/Kconfig b/Kconfig
index ca67f30..e03ab50 100644
--- a/Kconfig
+++ b/Kconfig
@@ -49,7 +49,7 @@ comment "Kernel options"

choice
prompt "CIP kernel version"
- default KERNEL_4_19
+ default KERNEL_5_10

config KERNEL_4_4
bool "Kernel 4.4.x-cip"
@@ -57,15 +57,20 @@ config KERNEL_4_4
config KERNEL_4_19
bool "Kernel 4.19.x-cip"

+config KERNEL_5_10
+ bool "Kernel 5.10.x-cip"
+
endchoice

config KAS_INCLUDE_KERNEL
string
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

config KERNEL_RT
bool "Real-time CIP kernel"
+ depends on !KERNEL_5_10

config KAS_INCLUDE_KERNEL_RT
string
diff --git a/conf/distro/cip-core-bullseye.conf b/conf/distro/cip-core-bullseye.conf
index 38014b4..a0790d5 100644
--- a/conf/distro/cip-core-bullseye.conf
+++ b/conf/distro/cip-core-bullseye.conf
@@ -12,5 +12,5 @@
require conf/distro/debian-bullseye.conf
require cip-core-common.inc

-PREFERRED_VERSION_linux-cip ?= "4.19.%"
+PREFERRED_VERSION_linux-cip ?= "5.10.%"
PREFERRED_VERSION_linux-cip-rt ?= "4.19.%"
diff --git a/conf/distro/cip-core-bullseye.conf b/kas/opt/5.10.yml
similarity index 50%
copy from conf/distro/cip-core-bullseye.conf
copy to kas/opt/5.10.yml
index 38014b4..612b7f9 100644
--- a/conf/distro/cip-core-bullseye.conf
+++ b/kas/opt/5.10.yml
@@ -9,8 +9,10 @@
# SPDX-License-Identifier: MIT
#

-require conf/distro/debian-bullseye.conf
-require cip-core-common.inc
+header:
+ version: 10

-PREFERRED_VERSION_linux-cip ?= "4.19.%"
-PREFERRED_VERSION_linux-cip-rt ?= "4.19.%"
+local_conf_header:
+ kernel-version: |
+ PREFERRED_VERSION_linux-cip = "5.10.%"
+ PREFERRED_VERSION_linux-cip-rt = "5.10.%"
diff --git a/conf/distro/cip-core-bullseye.conf b/recipes-kernel/linux/linux-cip_5.10.83-cip1.bb
similarity index 50%
copy from conf/distro/cip-core-bullseye.conf
copy to recipes-kernel/linux/linux-cip_5.10.83-cip1.bb
index 38014b4..a89f568 100644
--- a/conf/distro/cip-core-bullseye.conf
+++ b/recipes-kernel/linux/linux-cip_5.10.83-cip1.bb
@@ -9,8 +9,6 @@
# SPDX-License-Identifier: MIT
#

-require conf/distro/debian-bullseye.conf
-require cip-core-common.inc
+require linux-cip-common.inc

-PREFERRED_VERSION_linux-cip ?= "4.19.%"
-PREFERRED_VERSION_linux-cip-rt ?= "4.19.%"
+SRC_URI[sha256sum] = "85af8f809b2505c6434266d6658d977d62d383889b3a4f9968b2764794108d4f"
--
2.31.1

Join cip-dev@lists.cip-project.org to automatically receive all group messages.