From: Uladzimir Bely <ubely@ilbers.de>
To: isar-users@googlegroups.com
Subject: [PATCH v4 10/12] meta-isar: Base qemuamd64-sb config on qemuamd64
Date: Tue, 20 Jun 2023 08:05:42 +0200 [thread overview]
Message-ID: <20230620060544.19745-11-ubely@ilbers.de> (raw)
In-Reply-To: <20230620060544.19745-1-ubely@ilbers.de>
Base one on another in order to simplify maintanance and put emphasis
on secureboot-related differencies.
Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
meta-isar/conf/machine/qemuamd64-sb.conf | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/meta-isar/conf/machine/qemuamd64-sb.conf b/meta-isar/conf/machine/qemuamd64-sb.conf
index 315f5c00..0fa85155 100644
--- a/meta-isar/conf/machine/qemuamd64-sb.conf
+++ b/meta-isar/conf/machine/qemuamd64-sb.conf
@@ -1,12 +1,13 @@
# This software is a part of ISAR.
# Copyright (C) 2022 Siemens AG
+# Copyright (C) 2023 ilbers GmbH
-DISTRO_ARCH ?= "amd64"
+include conf/machine/qemuamd64.conf
-KERNEL_NAME ?= "amd64"
+WKS_FILE = "sdimage-efi-sb-debian"
-IMAGE_FSTYPES ?= "wic"
-WKS_FILE ?= "sdimage-efi-sb-debian"
+# use bootloader with signed boot support
+IMAGER_INSTALL:remove = "${GRUB_BOOTLOADER_INSTALL}"
IMAGER_INSTALL += "${GRUB_DEBIAN_SB_CHAIN}"
# include public keys
@@ -16,10 +17,5 @@ IMAGE_INSTALL += "sb-mok-public"
IMAGER_INSTALL += "${GRUB_DEBIAN_SB_MOK}"
IMAGE_PREINSTALL += "mokutil"
-QEMU_ARCH ?= "x86_64"
-QEMU_MACHINE ?= "q35"
-QEMU_CPU ?= ""
-QEMU_DISK_ARGS ?= "-drive file=##ROOTFS_IMAGE##,format=raw -global driver=cfi.pflash01,property=secure,value=on -drive if=pflash,format=raw,unit=0,file=/usr/share/OVMF/OVMF_CODE_4M.ms.fd,readonly=on"
-
-MACHINE_SERIAL ?= "ttyS0"
-BAUDRATE_TTY ?= "115200"
+# overwrite qemu disk args for signed boot
+QEMU_DISK_ARGS = "-drive file=##ROOTFS_IMAGE##,format=raw -global driver=cfi.pflash01,property=secure,value=on -drive if=pflash,format=raw,unit=0,file=/usr/share/OVMF/OVMF_CODE_4M.ms.fd,readonly=on"
--
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 ` [PATCH v4 09/12] meta-isar: Remove qemuamd64-sb settings from multiconfig Uladzimir Bely
2023-06-20 6:05 ` Uladzimir Bely [this message]
2023-06-20 6:05 ` [PATCH v4 11/12] meta-isar: Remove imx6-sabrelite " 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-11-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