From: "MOESSBAUER, Felix" <felix.moessbauer@siemens.com>
To: Anton Mikanovich <amikan@ilbers.de>,
"Kiszka, Jan" <jan.kiszka@siemens.com>,
Uladzimir Bely <ubely@ilbers.de>,
"isar-users@googlegroups.com" <isar-users@googlegroups.com>
Subject: RE: [PATCH v3 08/10] meta-isar: Remove qemuamd64-sb settings from multiconfig
Date: Thu, 15 Jun 2023 09:15:24 +0000 [thread overview]
Message-ID: <59e9eed32268456c95deef553a567742@siemens.com> (raw)
In-Reply-To: <606804d4-0116-98ec-14f7-dacf71273481@ilbers.de>
> Subject: Re: [PATCH v3 08/10] meta-isar: Remove qemuamd64-sb settings
> from multiconfig
>
> 15/06/2023 08:07, 'Jan Kiszka' via isar-users wrote:
> > 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/b37eca8a55e91777ec3fdb54c
> > 989326b54c0253f.1685895669.git.jan.kiszka%40siemens.com
> >
> Hello Jan, one of the main ideas here was to cleanup all the multiconfigs to
> enable building images with local.conf machine+distro values only.
> But qemuamd64-sb-bullseye is really special target currently. If we move
> those options to isar-image-ci recipe the target will be unusable without meta-
> test layer. All other targets are buildable even without meta-test which allows
> this new layer to be optional.
In my opinion, the example can be moved to the CI layer. In case users want to create SB enabled images with the Debian toolchain, they can simply set the WKS file accordingly and add the GRUB_DEBIAN_SB_MOK.
With the IMAGE_INSTALL / PREINSTALL lines, the target it hardly usable directly.
Best regards,
Felix
next prev parent reply other threads:[~2023-06-15 9:15 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-12 7:12 [PATCH v3 00/10] Move testsuite hacks to separate layer Uladzimir Bely
2023-06-12 7:12 ` [PATCH v3 01/10] CI: Introduce meta-test layer Uladzimir Bely
2023-06-12 7:12 ` [PATCH v3 02/10] ubuntu: Fix WKS_FILE overriding Uladzimir Bely
2023-06-12 7:12 ` [PATCH v3 03/10] CI: Move qemuamd64-bookworm hacks to CI layer Uladzimir Bely
2023-06-12 7:12 ` [PATCH v3 04/10] CI: Move qemuamd64-bullseye " Uladzimir Bely
2023-06-12 7:12 ` [PATCH v3 05/10] CI: Move qemuamd64-buster " Uladzimir Bely
2023-06-12 7:12 ` [PATCH v3 06/10] CI: Move qemuarm-bookworm " Uladzimir Bely
2023-06-12 7:12 ` [PATCH v3 07/10] CI: Move qemuarm64-bookworm " Uladzimir Bely
2023-06-12 7:12 ` [PATCH v3 08/10] meta-isar: Remove qemuamd64-sb settings from multiconfig Uladzimir Bely
2023-06-15 5:07 ` Jan Kiszka
2023-06-15 8:19 ` Anton Mikanovich
2023-06-15 9:15 ` MOESSBAUER, Felix [this message]
2023-06-12 7:12 ` [PATCH v3 09/10] meta-isar: Remove imx6-sabrelite " Uladzimir Bely
2023-06-12 7:12 ` [PATCH v3 10/10] meta-isar: Unify multiconfigs to use weak assignments Uladzimir Bely
2023-06-13 6:27 ` [PATCH v3 00/10] Move testsuite hacks to separate layer Uladzimir Bely
2023-06-15 5:13 ` Jan Kiszka
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=59e9eed32268456c95deef553a567742@siemens.com \
--to=felix.moessbauer@siemens.com \
--cc=amikan@ilbers.de \
--cc=isar-users@googlegroups.com \
--cc=jan.kiszka@siemens.com \
--cc=ubely@ilbers.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox