On 10.12.21 11:38, Gylstorff Quirin wrote:

On 12/10/21 10:58, Jan Kiszka wrote:

On 10.12.21 10:34, Q. Gylstorff wrote:

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

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@...>
---
  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"

This variable must be set by the kernel recipe, not the machine.

Jan

Ok, my reasoning was that I want the variable near it usage for
readability. It is only used when the KERNEL_DEFCONFIG is from [1].

The machine config has no knowledge about the kernel version that is
going to be used.
Jan