From: Uladzimir Bely <ubely@ilbers.de>
To: isar-users@googlegroups.com
Subject: [PATCH v4 09/12] meta-isar: Remove qemuamd64-sb settings from multiconfig
Date: Tue, 20 Jun 2023 08:05:41 +0200 [thread overview]
Message-ID: <20230620060544.19745-10-ubely@ilbers.de> (raw)
In-Reply-To: <20230620060544.19745-1-ubely@ilbers.de>
From: Anton Mikanovich <amikan@ilbers.de>
Machine-related configuration should be done in machine config, so move
it from multiconfig.
Also move example-module variant selection to local.conf.sample in order
not to be applied if we don't want to install example-module.
Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
meta-isar/conf/local.conf.sample | 5 +++++
meta-isar/conf/machine/qemuamd64-sb.conf | 7 +++++++
meta-isar/conf/multiconfig/qemuamd64-sb-bullseye.conf | 11 +----------
meta-test/conf/local.conf.sample | 4 ++++
4 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample
index c5d50931..c7820bdf 100644
--- a/meta-isar/conf/local.conf.sample
+++ b/meta-isar/conf/local.conf.sample
@@ -197,6 +197,11 @@ CONF_VERSION = "1"
# The default list of extra packages to be installed.
IMAGE_INSTALL = "hello-isar example-raw example-module-${KERNEL_NAME} enable-fsck isar-exclude-docs samefile hello isar-disable-apt-cache cowsay example-prebuilt"
+#
+# Machines with secure boot should use signed modules.
+IMAGE_INSTALL:remove:qemuamd64-sb = "example-module-${KERNEL_NAME}"
+IMAGE_INSTALL:append:qemuamd64-sb = "example-module-signed-${KERNEL_NAME}"
+
#
# Enable cross-compilation support
ISAR_CROSS_COMPILE ?= "0"
diff --git a/meta-isar/conf/machine/qemuamd64-sb.conf b/meta-isar/conf/machine/qemuamd64-sb.conf
index 84ef89eb..315f5c00 100644
--- a/meta-isar/conf/machine/qemuamd64-sb.conf
+++ b/meta-isar/conf/machine/qemuamd64-sb.conf
@@ -9,6 +9,13 @@ IMAGE_FSTYPES ?= "wic"
WKS_FILE ?= "sdimage-efi-sb-debian"
IMAGER_INSTALL += "${GRUB_DEBIAN_SB_CHAIN}"
+# include public keys
+IMAGE_INSTALL += "sb-mok-public"
+
+# add MOK utilities to insert MOK into EFI
+IMAGER_INSTALL += "${GRUB_DEBIAN_SB_MOK}"
+IMAGE_PREINSTALL += "mokutil"
+
QEMU_ARCH ?= "x86_64"
QEMU_MACHINE ?= "q35"
QEMU_CPU ?= ""
diff --git a/meta-isar/conf/multiconfig/qemuamd64-sb-bullseye.conf b/meta-isar/conf/multiconfig/qemuamd64-sb-bullseye.conf
index edfcf70b..85ce3a65 100644
--- a/meta-isar/conf/multiconfig/qemuamd64-sb-bullseye.conf
+++ b/meta-isar/conf/multiconfig/qemuamd64-sb-bullseye.conf
@@ -1,13 +1,4 @@
# This software is a part of ISAR.
+
MACHINE ?= "qemuamd64-sb"
DISTRO ?= "debian-bullseye"
-
-# include public keys
-IMAGE_INSTALL += "sb-mok-public"
-# remove unsigned example module and include signed example module
-IMAGE_INSTALL:remove = "example-module-${KERNEL_NAME}"
-IMAGE_INSTALL += "example-module-signed-${KERNEL_NAME}"
-
-# add MOK utilities to insert MOK into EFI
-IMAGER_INSTALL += "${GRUB_DEBIAN_SB_MOK}"
-IMAGE_PREINSTALL += "mokutil"
diff --git a/meta-test/conf/local.conf.sample b/meta-test/conf/local.conf.sample
index ed569c5c..a3280a5d 100644
--- a/meta-test/conf/local.conf.sample
+++ b/meta-test/conf/local.conf.sample
@@ -75,6 +75,10 @@ MIRRORS += "https?://cdn\.kernel\.org/.* https://mirrors.edge.kernel.org/PATH"
# The default list of extra packages
IMAGE_INSTALL = "hello-isar example-raw example-module-${KERNEL_NAME} enable-fsck isar-exclude-docs samefile hello isar-disable-apt-cache cowsay example-prebuilt"
+# Machines with secure boot should use signed modules
+IMAGE_INSTALL:remove:qemuamd64-sb = "example-module-${KERNEL_NAME}"
+IMAGE_INSTALL:append:qemuamd64-sb = "example-module-signed-${KERNEL_NAME}"
+
# Users and groups
USERS += "root"
USER_root[password] ??= "$6$rounds=10000$RXeWrnFmkY$DtuS/OmsAS2cCEDo0BF5qQsizIrq6jPgXnwv3PHqREJeKd1sXdHX/ayQtuQWVDHe0KIO0/sVH8dvQm1KthF0d/"
--
2.20.1
next prev parent reply other threads:[~2023-06-20 6:05 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-20 6:05 [PATCH v4 00/12] Move testsuite hacks to separate layer Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 01/12] CI: Introduce meta-test layer Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 02/12] ubuntu: Fix WKS_FILE overriding Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 03/12] CI: Move qemuamd64-bookworm hacks to CI layer Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 04/12] CI: Move qemuamd64-bullseye " Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 05/12] CI: Move qemuamd64-buster " Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 06/12] CI: Move qemuarm-bookworm " Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 07/12] CI: Move qemuarm64-bookworm " Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 08/12] meta-isar: Cleanup machine configs Uladzimir Bely
2023-06-20 6:05 ` Uladzimir Bely [this message]
2023-06-20 6:05 ` [PATCH v4 10/12] meta-isar: Base qemuamd64-sb config on qemuamd64 Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 11/12] meta-isar: Remove imx6-sabrelite settings from multiconfig Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 12/12] meta-isar: Unify multiconfigs to use weak assignments Uladzimir Bely
2023-06-21 13:49 ` [PATCH v4 00/12] Move testsuite hacks to separate layer Henning Schild
2023-06-27 5:21 ` Uladzimir Bely
2023-06-27 5:32 ` Uladzimir Bely
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=20230620060544.19745-10-ubely@ilbers.de \
--to=ubely@ilbers.de \
--cc=isar-users@googlegroups.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox