From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7243694205603676160 X-Received: by 2002:a05:6a20:9146:b0:106:9266:4448 with SMTP id x6-20020a056a20914600b0010692664448mr10789896pzc.16.1686553985386; Mon, 12 Jun 2023 00:13:05 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a62:d156:0:b0:659:1fd1:a684 with SMTP id t22-20020a62d156000000b006591fd1a684ls4190727pfl.1.-pod-prod-06-us; Mon, 12 Jun 2023 00:13:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ60nzc02LQ4fp8o6QWbVRyYuHSQGX1RhPLd6LQku3XzV6xWc03XCHSuIniR7Zja13x9WsuT X-Received: by 2002:a05:6a00:24c9:b0:64d:4412:9923 with SMTP id d9-20020a056a0024c900b0064d44129923mr10642032pfv.3.1686553984533; Mon, 12 Jun 2023 00:13:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686553984; cv=none; d=google.com; s=arc-20160816; b=rJLCHx8wyYztjmY2cvk355ct4V0dJ/EI1e8bHaFWiSGPeFepa6TSM9WwUcDN0/221j v84TfV5C8q5Awsug140CwSaSjx3q4KWWcgkYGNbKoolIkRs5H+AKfLpQqOZXX0yP7F5y qpYgrcVuqhmgwa1gLXOD+cdkOCPVIiKFNMMrS0hgCoA4CRKWY2sYIs+o/+Wo6b6HSXTG QLhjnjR0MPZqtffCq/NcCN+fhwMaKNf6NSAW1nwONSarKAfK/lqRN1AJhA9qMRvnsNBq q7eYOI1ZXqth5zQSCZqONx6f1z3mFyeka9x7WgETEZLxnmSxuds+So1H74ra+S0+DWJY D70Q== 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=9WdE0RX26Xhp4qr+lIMcGax0Nr2H/XD2FR0RZBivd0k=; b=XdLHDTseUxzq1SookJsFKKHLL+Tkvvsqovnac9sc/qPpTlYCCs31B89Am0uJ9BwV9y Z8+zZs1RpzY/s51cSgwhsr1S1oBSeQZ6udhqLmD2xa98vhDB3oY0B3QbYF3AfZN05qcO zk46cohCHGdOnIxzZMJIsW5ojU0McxnuBjMsNc1CMMGO3y7rtamyZ4FlfaqnODyEghIz x2IFFJvNNCKWsRMJvk3wZh0yVFWntRm70UrG32r0T7IROyfQ3kc0B8Hkse5tDMMR6CEb 7fkWxNWeMR6ifCtXPn6TncX095uZLfAm2HPoL3gnANP1PT1eGmNZcqV9KQQ4UqH175h2 BZgA== 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 p8-20020a056a000a0800b0066115badfa4si827988pfh.4.2023.06.12.00.13.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jun 2023 00:13:04 -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 35C7Cuco007465 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 12 Jun 2023 09:12:59 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 08/10] meta-isar: Remove qemuamd64-sb settings from multiconfig Date: Mon, 12 Jun 2023 09:12:54 +0200 Message-Id: <20230612071256.8688-9-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230612071256.8688-1-ubely@ilbers.de> References: <20230612071256.8688-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: jPP2yTedlUz4 From: Anton Mikanovich Machine-related configuration should be done in machine config, so move it from multiconfig. Signed-off-by: Anton Mikanovich Signed-off-by: Uladzimir Bely --- 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" -- 2.20.1