All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Q. Gylstorff" <Quirin.Gylstorff@siemens.com>
To: cip-dev@lists.cip-project.org, jan.kiszka@siemens.com
Subject: [cip-dev][isar-cip-core][PATCH] conf/machine/*: Add variable to set version of kernel defconfig
Date: Fri, 10 Dec 2021 10:34:48 +0100	[thread overview]
Message-ID: <20211210093448.1860864-1-Quirin.Gylstorff@siemens.com> (raw)

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

This fixes an issue, that the defconfig from kernel 4.19.X does not
work with kernel 5.10.X. The kernel boots but cannot find any qemu hard
disk.

The fix adds the new Variable
KERNEL_DEFCONFIG_VERSION to select to correct path in [1].

This fixes issue [17].

[1]: https://gitlab.com/cip-project/cip-kernel/cip-kernel-config
[17]: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/17

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 conf/machine/hihope-rzg2m.conf    | 3 ++-
 conf/machine/qemu-amd64.conf      | 3 ++-
 conf/machine/qemu-arm.conf        | 3 ++-
 conf/machine/qemu-arm64.conf      | 3 ++-
 conf/machine/simatic-ipc227e.conf | 3 ++-
 kas/opt/4.19.yml                  | 2 ++
 kas/opt/4.4.yml                   | 2 ++
 kas/opt/5.10.yml                  | 2 ++
 8 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/conf/machine/hihope-rzg2m.conf b/conf/machine/hihope-rzg2m.conf
index 4f4ee81..74f03df 100644
--- a/conf/machine/hihope-rzg2m.conf
+++ b/conf/machine/hihope-rzg2m.conf
@@ -13,7 +13,8 @@ DISTRO_ARCH = "arm64"
 
 IMAGE_TYPE ?= "wic-img"
 
-KERNEL_DEFCONFIG = "cip-kernel-config/4.19.y-cip/arm64/renesas_defconfig"
+KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip"
+KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/renesas_defconfig"
 USE_CIP_KERNEL_CONFIG = "1"
 DTB_FILES = "r8a774a1-hihope-rzg2m-ex.dtb"
 IMAGE_BOOT_FILES = "${KERNEL_IMAGE} ${DTB_FILES}"
diff --git a/conf/machine/qemu-amd64.conf b/conf/machine/qemu-amd64.conf
index c90d957..af20bf4 100644
--- a/conf/machine/qemu-amd64.conf
+++ b/conf/machine/qemu-amd64.conf
@@ -10,4 +10,5 @@ DISTRO_ARCH = "amd64"
 
 IMAGE_TYPE ?= "ext4-img"
 USE_CIP_KERNEL_CONFIG = "1"
-KERNEL_DEFCONFIG = "cip-kernel-config/4.19.y-cip/x86/cip_qemu_defconfig"
+KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip"
+KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/cip_qemu_defconfig"
diff --git a/conf/machine/qemu-arm.conf b/conf/machine/qemu-arm.conf
index 81a22c1..f9e665d 100644
--- a/conf/machine/qemu-arm.conf
+++ b/conf/machine/qemu-arm.conf
@@ -11,4 +11,5 @@ DISTRO_ARCH = "armhf"
 
 IMAGE_TYPE ?= "ext4-img"
 USE_CIP_KERNEL_CONFIG = "1"
-KERNEL_DEFCONFIG ?= "cip-kernel-config/4.19.y-cip/arm/qemu_arm_defconfig"
+KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip"
+KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm/qemu_arm_defconfig"
diff --git a/conf/machine/qemu-arm64.conf b/conf/machine/qemu-arm64.conf
index eb34703..1a48093 100644
--- a/conf/machine/qemu-arm64.conf
+++ b/conf/machine/qemu-arm64.conf
@@ -10,4 +10,5 @@ DISTRO_ARCH = "arm64"
 
 IMAGE_TYPE ?= "ext4-img"
 USE_CIP_KERNEL_CONFIG = "1"
-KERNEL_DEFCONFIG ?= "cip-kernel-config/4.19.y-cip/arm64/qemu_arm64_defconfig"
+KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip"
+KERNEL_DEFCONFIG ?= "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/arm64/qemu_arm64_defconfig"
diff --git a/conf/machine/simatic-ipc227e.conf b/conf/machine/simatic-ipc227e.conf
index 3c9638f..d8c7fec 100644
--- a/conf/machine/simatic-ipc227e.conf
+++ b/conf/machine/simatic-ipc227e.conf
@@ -11,4 +11,5 @@ DISTRO_ARCH = "amd64"
 IMAGE_TYPE ?= "wic-img"
 IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
 USE_CIP_KERNEL_CONFIG = "1"
-KERNEL_DEFCONFIG = "cip-kernel-config/4.19.y-cip/x86/siemens_ipc227e_defconfig"
+KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip"
+KERNEL_DEFCONFIG = "cip-kernel-config/${KERNEL_DEFCONFIG_VERSION}/x86/siemens_ipc227e_defconfig"
diff --git a/kas/opt/4.19.yml b/kas/opt/4.19.yml
index 5ff1683..581ea93 100644
--- a/kas/opt/4.19.yml
+++ b/kas/opt/4.19.yml
@@ -16,3 +16,5 @@ local_conf_header:
   kernel-version: |
     PREFERRED_VERSION_linux-cip = "4.19.%"
     PREFERRED_VERSION_linux-cip-rt = "4.19.%"
+  defconfig: |
+    KERNEL_DEFCONFIG_VERSION ?= "4.19.y-cip"
diff --git a/kas/opt/4.4.yml b/kas/opt/4.4.yml
index 65a4775..dae1b52 100644
--- a/kas/opt/4.4.yml
+++ b/kas/opt/4.4.yml
@@ -16,3 +16,5 @@ local_conf_header:
   kernel-version: |
     PREFERRED_VERSION_linux-cip = "4.4.%"
     PREFERRED_VERSION_linux-cip-rt = "4.4.%"
+  defconfig: |
+    KERNEL_DEFCONFIG_VERSION ?= "4.4.y-cip"
diff --git a/kas/opt/5.10.yml b/kas/opt/5.10.yml
index 612b7f9..e048450 100644
--- a/kas/opt/5.10.yml
+++ b/kas/opt/5.10.yml
@@ -16,3 +16,5 @@ local_conf_header:
   kernel-version: |
     PREFERRED_VERSION_linux-cip = "5.10.%"
     PREFERRED_VERSION_linux-cip-rt = "5.10.%"
+  defconfig: |
+    KERNEL_DEFCONFIG_VERSION ?= "5.10.y-cip"
-- 
2.33.0



             reply	other threads:[~2021-12-10  9:35 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-12-10  9:34 Q. Gylstorff [this message]
2021-12-10  9:58 ` [cip-dev][isar-cip-core][PATCH] conf/machine/*: Add variable to set version of kernel defconfig Jan Kiszka
2021-12-10 10:38   ` Gylstorff Quirin
2021-12-10 10:40     ` Jan Kiszka
2021-12-10 10:43       ` Gylstorff Quirin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211210093448.1860864-1-Quirin.Gylstorff@siemens.com \
    --to=quirin.gylstorff@siemens.com \
    --cc=cip-dev@lists.cip-project.org \
    --cc=jan.kiszka@siemens.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.