Re: [PATCH v3 08/10] meta-isar: Remove qemuamd64-sb settings from multiconfig

[Jan Kiszka <jan.kiszka@siemens.com>]

On 12.06.23 09:12, Uladzimir Bely wrote:
> From: Anton Mikanovich <amikan@ilbers.de>
> 
> Machine-related configuration should be done in machine config, so move
> it from multiconfig.
> 
> Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
> Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
> ---
>  meta-isar/conf/machine/qemuamd64-sb.conf              |  9 +++++++++
>  meta-isar/conf/multiconfig/qemuamd64-sb-bullseye.conf | 10 +---------
>  2 files changed, 10 insertions(+), 9 deletions(-)
> 
> diff --git a/meta-isar/conf/machine/qemuamd64-sb.conf b/meta-isar/conf/machine/qemuamd64-sb.conf
> index c581ab39..419db3b2 100644
> --- a/meta-isar/conf/machine/qemuamd64-sb.conf
> +++ b/meta-isar/conf/machine/qemuamd64-sb.conf
> @@ -9,6 +9,15 @@ IMAGE_FSTYPES ?= "wic"
>  WKS_FILE ?= "sdimage-efi-sb-debian"
>  IMAGER_INSTALL += "${GRUB_DEBIAN_SB_CHAIN}"
>  
> +# include public keys
> +IMAGE_INSTALL += "sb-mok-public"
> +# include signed example module
> +IMAGE_INSTALL += "example-module-signed-${KERNEL_NAME}"
> +
> +# add MOK utilities to insert MOK into EFI
> +IMAGER_INSTALL += "${GRUB_DEBIAN_SB_MOK}"
> +IMAGE_PREINSTALL += "mokutil"
> +
>  IMAGE_INSTALL += "sshd-regen-keys"
>  
>  QEMU_ARCH ?= "x86_64"
> diff --git a/meta-isar/conf/multiconfig/qemuamd64-sb-bullseye.conf b/meta-isar/conf/multiconfig/qemuamd64-sb-bullseye.conf
> index 19a105eb..85ce3a65 100644
> --- a/meta-isar/conf/multiconfig/qemuamd64-sb-bullseye.conf
> +++ b/meta-isar/conf/multiconfig/qemuamd64-sb-bullseye.conf
> @@ -1,12 +1,4 @@
>  # This software is a part of ISAR.
> +
>  MACHINE ?= "qemuamd64-sb"
>  DISTRO ?= "debian-bullseye"
> -
> -# include public keys
> -IMAGE_INSTALL += "sb-mok-public"
> -# include signed example module
> -IMAGE_INSTALL += "example-module-signed-${KERNEL_NAME}"
> -
> -# add MOK utilities to insert MOK into EFI
> -IMAGER_INSTALL += "${GRUB_DEBIAN_SB_MOK}"
> -IMAGE_PREINSTALL += "mokutil"

This is an anti-pattern when you want to allow reusing the machine
configs outside of Isar testing scenarios, see also [1].

Jan

[1]
https://groups.google.com/d/msgid/isar-users/b37eca8a55e91777ec3fdb54c989326b54c0253f.1685895669.git.jan.kiszka%40siemens.com

-- 
Siemens AG, Technology
Competence Center Embedded Linux