[PATCH v1 02/10] ubuntu: Fix WKS_FILE overriding

[Anton Mikanovich <amikan@ilbers.de>]

To enable setting custom WKS_FILE inside local.conf move overridden
value from machine config to meta-test. Also move distro-related
changing of KERNEL_NAME distro config.

Reported-by: Felix Moessbauer <felix.moessbauer@siemens.com>
Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 meta-isar/conf/distro/ubuntu-focal.conf         | 2 ++
 meta-isar/conf/machine/qemuamd64.conf           | 4 ----
 meta-isar/conf/multiconfig/qemuamd64-focal.conf | 2 --
 meta-test/recipes-ci/images/isar-image-ci.bb    | 5 +++++
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/meta-isar/conf/distro/ubuntu-focal.conf b/meta-isar/conf/distro/ubuntu-focal.conf
index 0cb6958d..40b9b29c 100644
--- a/meta-isar/conf/distro/ubuntu-focal.conf
+++ b/meta-isar/conf/distro/ubuntu-focal.conf
@@ -17,6 +17,8 @@ BOOTSTRAP_KEY = "file://${LAYERDIR_isar}/conf/distro/ubuntu.public.key;sha256sum
 DISTRO_BOOTSTRAP_KEYS += "${BOOTSTRAP_KEY}"
 HOST_DISTRO_BOOTSTRAP_KEYS += "${BOOTSTRAP_KEY}"
 
+# kernel package name is linux-image-generic in Ubuntu
+KERNEL_NAME = "generic"
 
 # that is what debootstrap_1.0.118ubuntu1 does anyways
 DISTRO_DEBOOTSTRAP_SCRIPT = "/usr/share/debootstrap/scripts/gutsy"
diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf
index 0c768258..c02b3860 100644
--- a/meta-isar/conf/machine/qemuamd64.conf
+++ b/meta-isar/conf/machine/qemuamd64.conf
@@ -4,15 +4,11 @@
 DISTRO_ARCH ?= "amd64"
 
 KERNEL_NAME ?= "amd64"
-KERNEL_NAME:ubuntu-focal ?= "generic"
 
 IMAGE_FSTYPES ?= "wic"
 WKS_FILE ?= "sdimage-efi"
 IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
 
-WKS_FILE:ubuntu-focal ?= "sdimage-efi-sd"
-IMAGER_INSTALL:remove:ubuntu-focal = "${GRUB_BOOTLOADER_INSTALL}"
-
 WKS_FILE:debian-bullseye ?= "sdimage-efi-btrfs"
 IMAGER_INSTALL:remove:debian-bullseye = "${GRUB_BOOTLOADER_INSTALL}"
 IMAGER_INSTALL:append:debian-bullseye = " ${SYSTEMD_BOOTLOADER_INSTALL} btrfs-progs"
diff --git a/meta-isar/conf/multiconfig/qemuamd64-focal.conf b/meta-isar/conf/multiconfig/qemuamd64-focal.conf
index 3de0b809..09076eba 100644
--- a/meta-isar/conf/multiconfig/qemuamd64-focal.conf
+++ b/meta-isar/conf/multiconfig/qemuamd64-focal.conf
@@ -5,5 +5,3 @@
 
 MACHINE ?= "qemuamd64"
 DISTRO ?= "ubuntu-focal"
-
-IMAGER_INSTALL += "${SYSTEMD_BOOTLOADER_INSTALL}"
diff --git a/meta-test/recipes-ci/images/isar-image-ci.bb b/meta-test/recipes-ci/images/isar-image-ci.bb
index be122a6a..e17ae27e 100644
--- a/meta-test/recipes-ci/images/isar-image-ci.bb
+++ b/meta-test/recipes-ci/images/isar-image-ci.bb
@@ -10,3 +10,8 @@ ISAR_RELEASE_CMD = "git -C ${LAYERDIR_test} describe --tags --dirty --match 'v[0
 
 # Setup SSH server on board
 IMAGE_INSTALL += "isar-ci-ssh-setup"
+
+# qemuamd64-focal
+WKS_FILE:qemuamd64:ubuntu-focal ?= "sdimage-efi-sd"
+IMAGER_INSTALL:remove:qemuamd64:ubuntu-focal ?= "${GRUB_BOOTLOADER_INSTALL}"
+IMAGER_INSTALL:append:qemuamd64:ubuntu-focal ?= " ${SYSTEMD_BOOTLOADER_INSTALL}"
-- 
2.34.1