From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7243694205603676160 X-Received: by 2002:a05:6214:29c2:b0:5ef:5e1b:a365 with SMTP id gh2-20020a05621429c200b005ef5e1ba365mr13899395qvb.10.1687241151562; Mon, 19 Jun 2023 23:05:51 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6214:b86:b0:62d:f315:97a9 with SMTP id fe6-20020a0562140b8600b0062df31597a9ls3500558qvb.1.-pod-prod-02-us; Mon, 19 Jun 2023 23:05:51 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4KT798NWvaHdSH4H7KoiInw7gGhasi5Av1eC01CiYlta7gEU9dWuxvvh4A9xHN0o4swtQu X-Received: by 2002:a67:fc52:0:b0:43f:5d56:7473 with SMTP id p18-20020a67fc52000000b0043f5d567473mr4159100vsq.33.1687241150951; Mon, 19 Jun 2023 23:05:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687241150; cv=none; d=google.com; s=arc-20160816; b=VkDqvq8iEBv32rq1Yw+KeGqJc8v7fa+hSYAH+AdSE+dtKMLtPjBUfIYZUJv/xp5eVG ga2/ygvFxVikWPpLFbv6hooOde5Dd6K335E81zy8+VVe4dkUxp1UBj91EeZAahkRDtoT UmkvPc3uNhrmH2PaYdqwF5B0hQgQCX2t3MZgmalUtVn/AdJ9nGTAqhwnOzPtnafN8q+x 9ReN5VoNMbx5PTvNpp5pbMlnva2zjKPMVnBgc0gs+XTLPQdIZ2423S3MibpS32IlGZgF ZNLjvLXcWu+F+uP1ITM4w2huukjeQ+ep9GrZqsMmrF+OeQcfueSEVO2OJvI9kNzi8vLY iVeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=jKx5+NgB6+6CHc8BnvHHd8w0oBOpkIslWM6knj0qJ3I=; b=eEuf6a/u2LFn8vPHch4gvCMrNYX0euObF58v7qXfAuSK2T5fFivx6hDEsxSvGs7Atc ksrWaiHb0pUnSxjJH0zxJtSsVwxoB9NBKRU2w7NBEk5fg653ktE1OCotAshB7Jsep4jb Uohvti9/Hm9VZ0Rw9ev3k4enZFbOR1YXTvA3Zmr9KUXjEg6MDgxuCqmaurWYVhtS7bRU NAKO5AQCKS+BWl5pzM4fzRy3s1tr0i88q6imWxOMlRfao5G4Mtq1h01gmKt3MEGoQ3qn 2emVKiah9B9Eh0yfKsOwImRtcm1BuFSNFd/DxpxNzBRKfTITNlf+1njkc8n/gdbYCUVu /R4w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id f36-20020a056102152400b00437e504434fsi72767vsv.1.2023.06.19.23.05.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Jun 2023 23:05:50 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 35K65iY5027569 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 20 Jun 2023 08:05:48 +0200 From: Uladzimir Bely 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 Message-Id: <20230620060544.19745-11-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230620060544.19745-1-ubely@ilbers.de> References: <20230620060544.19745-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: T8aTasxkla6k Base one on another in order to simplify maintanance and put emphasis on secureboot-related differencies. Signed-off-by: Uladzimir Bely --- 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