From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7239976793797558272 X-Received: by 2002:a05:6a00:124c:b0:652:fbee:84cd with SMTP id u12-20020a056a00124c00b00652fbee84cdmr550040pfi.34.1685688458140; Thu, 01 Jun 2023 23:47:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a62:8703:0:b0:64d:42b5:3305 with SMTP id i3-20020a628703000000b0064d42b53305ls575436pfe.1.-pod-prod-03-us; Thu, 01 Jun 2023 23:47:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6MWtVp3g1DqWVN7TBxIT/QPaZz/qxR1rXrOOwGYNeGKBEyjXvMsn6CMcxTE5L8kIJEnV5m X-Received: by 2002:a05:6a00:2e05:b0:64f:4197:8d93 with SMTP id fc5-20020a056a002e0500b0064f41978d93mr15621884pfb.24.1685688457203; Thu, 01 Jun 2023 23:47:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685688457; cv=none; d=google.com; s=arc-20160816; b=qJE9I4wZYLWor79HkQRT7KVzikMmhvp42dK5WRfH7QpesjQ2rTFz7IAZ4AXRanES6H U8vQK8c7inscBowcCt9nCJ0jsyRCegK3lB7pdWcsDxT1jGt5GIbLW2E9g1KCIpHKvrIT 36frKTXQnTFVavWhOBAu7HamxoDGIXVfOuOWicoXT5xJ1TF8dLCx7VVdo2dF0/WmDA2B G9XBBG6J3Ffff7/byiUYzKZ47C+0t7Xe0d8NGTqetC36qjAPG5oCh1IKF8dUWXsGesAn 3geFcLK3E2raF1kHnT6evzp6NzxXpPnZZ6p4DnIfiA/AAMhkCZzgqb9r4vNYsrV7NqB/ P3WQ== 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=f0W72HX1w10V4anrppOgGTbnalG0DXavIKp2GMzgVBn/UCxAXcRFI9Qm/BhB1lUTui 7to/dy9DImqjbdAYOt+yB8P62LniNNIDkjSg6ZGqZf8XpZ4O/3sh9ZlnaNqgHNb1wtNh NLzNDFW08Rb3u0bU7JblxHqYenFPHXSUuGhe/5BFPu/ctE/l1x1yaTCADh6fzzwkbdVF pRo7th5yb9r3nr3KBBpTN3j5bNXlFx2NsWcT81PpHCnsyLY56qyF2KGwjQj/0v0Z8q1W 34yY/iRogiboBMSvWqKHWEtr9jqHA7QadEBmF5H5DvWvSbJAhrdVxnAt5KKbWfSbIhLy mq+A== 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 ay5-20020a056a00300500b0064f41375fa5si43228pfb.3.2023.06.01.23.47.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 Jun 2023 23:47:37 -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 3526lTcx003460 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 2 Jun 2023 08:47:32 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 08/10] meta-isar: Remove qemuamd64-sb settings from multiconfig Date: Fri, 2 Jun 2023 08:47:27 +0200 Message-Id: <20230602064729.10331-9-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230602064729.10331-1-ubely@ilbers.de> References: <20230602064729.10331-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: /ckAdLlLCwH/ 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