Add 5.10 recipe, fix free choice of kernel versions
cover Add 5.10 recipe, fix free choice of kernel versions
See patches for details.
Jan
Jan Kiszka (2):
Add kas option to selection 4.19 explicitly
linux-cip: Add recipe, option file and menu entry for 5.10.83-cip1
Kconfig | 11 ++++++++--- conf/distro/cip-core-bullseye.conf | 2 +- .../distro/cip-core-bullseye.conf => kas/opt/4.19.yml | 10 ++++++---- .../distro/cip-core-bullseye.conf => kas/opt/5.10.yml | 10 ++++++---- .../linux/linux-cip_5.10.83-cip1.bb | 6 ++---- 5 files changed, 23 insertions(+), 16 deletions(-) copy conf/distro/cip-core-bullseye.conf => kas/opt/4.19.yml (50%) 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%)
Signature · 1 line
2.31.1
PATCH 1/2 Add kas option to selection 4.19 explicitly
From: Jan Kiszka <[email protected]>
The distro configs provide a default choice of the kernel version. Therefore, we cannot rely on 4.19 being chosen when not providing any kas option file.
Signed-off-by Jan Kiszka <[email protected]>
--- Kconfig | 4 ++-- kas/opt/4.19.yml | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 kas/opt/4.19.yml
Kconfig +2 -2
@@ -61,8 +61,8 @@ endchoice config KAS_INCLUDE_KERNEL string - default "kas/opt/4.4.yml" - depends on KERNEL_4_4 + default "kas/opt/4.4.yml" if KERNEL_4_4 + default "kas/opt/4.19.yml" if KERNEL_4_19 config KERNEL_RT bool "Real-time CIP kernel"
kas/opt/4.19.yml new file +18 -0
@@ -0,0 +1,18 @@ +# +# CIP Core, generic profile +# +# Copyright (c) Siemens AG, 2021 +# +# Authors: +# Jan Kiszka <[email protected]> +# +# SPDX-License-Identifier: MIT +# + +header: + version: 10 + +local_conf_header: + kernel-version: | + PREFERRED_VERSION_linux-cip = "4.19.%" + PREFERRED_VERSION_linux-cip-rt = "4.19.%"
Signature · 1 line
2.31.1
PATCH 2/2 linux-cip: Add recipe, option file and menu entry for 5.10.83-cip1
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
No -rt kernel released so far, thus we need to confine the choice when 5.10 is selected.
Signed-off-by Jan Kiszka <[email protected]>
--- 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%)
Kconfig +6 -1
@@ -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
conf/distro/cip-core-bullseye.conf +1 -1
@@ -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.%"
kas/opt/5.10.yml renamed from conf/distro/cip-core-bullseye.conf +6 -4
@@ -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.%"
recipes-kernel/linux/linux-cip_5.10.83-cip1.bb renamed from conf/distro/cip-core-bullseye.conf +2 -4
@@ -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"
Signature · 1 line
2.31.1