[isar-cip-core,v2] linux: Factor out cip-kernel-config and use it for 6.1 mainline as well

Commit Message

Jan Kiszka May 17, 2023, 2:42 p.m. UTC

From: Jan Kiszka <[e-mail]>

This fixes the build of linux-mainline for targets that have
USE_CIP_KERNEL_CONFIG set.

As Srinuvasan A pointed out, squashfs is now set via the 6.1 config in
cip-kernel-config. Therefore drop the obsolete fragment.

Closes: #64
Signed-off-by: Jan Kiszka <[e-mail]>
---
 kas/opt/6.1-mainline.yml                      |  1 -
 recipes-kernel/linux/cip-kernel-config.inc    | 17 +++++++++++++++++
 recipes-kernel/linux/files/squashfs.cfg       |  1 -
 recipes-kernel/linux/linux-cip-common.inc     |  9 ++-------
 recipes-kernel/linux/linux-mainline_6.1.15.bb |  6 ++++--
 5 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 recipes-kernel/linux/cip-kernel-config.inc
 delete mode 100644 recipes-kernel/linux/files/squashfs.cfg

Patch

diff --git a/kas/opt/6.1-mainline.yml b/kas/opt/6.1-mainline.yml
index 84d12b0b..0dcf3364 100644
--- a/kas/opt/6.1-mainline.yml
+++ b/kas/opt/6.1-mainline.yml
@@ -14,5 +14,4 @@  header:
 
 local_conf_header:
   kernel-version: |
-    KERNEL_DEFCONFIG = ""
     KERNEL_NAME = "mainline"
diff --git a/recipes-kernel/linux/cip-kernel-config.inc b/recipes-kernel/linux/cip-kernel-config.inc
new file mode 100644
index 00000000..329b9f7e
--- /dev/null
+++ b/recipes-kernel/linux/cip-kernel-config.inc
@@ -0,0 +1,17 @@ 
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2022-2023
+#
+# Authors:
+#  Jan Kiszka <[e-mail]>
+#
+# SPDX-License-Identifier: MIT
+#
+
+SRC_URI:append = " ${@ \
+    'git://gitlab.com/cip-project/cip-kernel/cip-kernel-config.git;protocol=https;branch=master;destsuffix=cip-kernel-config;name=cip-kernel-config' \
+    if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else '' \
+    }"
+
+SRCREV_cip-kernel-config ?= "d1efa37258380c7f4f39a8dee1bdb4d85f1c0199"
diff --git a/recipes-kernel/linux/files/squashfs.cfg b/recipes-kernel/linux/files/squashfs.cfg
deleted file mode 100644
index 7a89d006..00000000
--- a/recipes-kernel/linux/files/squashfs.cfg
+++ /dev/null
@@ -1 +0,0 @@ 
-CONFIG_SQUASHFS=y
diff --git a/recipes-kernel/linux/linux-cip-common.inc b/recipes-kernel/linux/linux-cip-common.inc
index a700d30e..c0f076a9 100644
--- a/recipes-kernel/linux/linux-cip-common.inc
+++ b/recipes-kernel/linux/linux-cip-common.inc
@@ -1,7 +1,7 @@ 
 #
 # CIP Core, generic profile
 #
-# Copyright (c) Siemens AG, 2022
+# Copyright (c) Siemens AG, 2022-2023
 #
 # Authors:
 #  Jan Kiszka <[e-mail]>
@@ -14,15 +14,10 @@  FILESEXTRAPATHS:prepend := "${FILE_DIRNAME}/files:"
 KERNEL_DEFCONFIG ?= "${MACHINE}_defconfig"
 
 require recipes-kernel/linux/linux-custom.inc
+require recipes-kernel/linux/cip-kernel-config.inc
 
 SRC_URI += " \
     https://git.kernel.org/pub/scm/linux/kernel/git/cip/linux-cip.git/snapshot/linux-cip-${PV}.tar.gz \
     "
 
-SRC_URI:append = " ${@ "git://gitlab.com/cip-project/cip-kernel/cip-kernel-config.git;protocol=https;branch=master;destsuffix=cip-kernel-config;name=cip-kernel-config" \
-    if d.getVar('USE_CIP_KERNEL_CONFIG') == '1' else '' \
-    }"
-
-SRCREV_cip-kernel-config ?= "d1efa37258380c7f4f39a8dee1bdb4d85f1c0199"
-
 S = "${WORKDIR}/linux-cip-${PV}"
diff --git a/recipes-kernel/linux/linux-mainline_6.1.15.bb b/recipes-kernel/linux/linux-mainline_6.1.15.bb
index f6cd7b8b..9b45f28e 100644
--- a/recipes-kernel/linux/linux-mainline_6.1.15.bb
+++ b/recipes-kernel/linux/linux-mainline_6.1.15.bb
@@ -5,12 +5,14 @@ 
 # 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 \
-    file://squashfs.cfg"
+    https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-${ARCHIVE_VERSION}.tar.xz"
 
 SRC_URI[sha256sum] = "2c16dfe2168a2e64ac0d55a12d625ebfb963818bb48b60c1868c7c460644c4fd"