From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7227180191860129792 X-Received: by 2002:a05:6870:1399:b0:186:d9e3:e279 with SMTP id 25-20020a056870139900b00186d9e3e279mr1606286oas.5.1682709024281; Fri, 28 Apr 2023 12:10:24 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:4686:b0:18e:d7e7:82c0 with SMTP id a6-20020a056870468600b0018ed7e782c0ls1364242oap.1.-pod-prod-gmail; Fri, 28 Apr 2023 12:10:23 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5zb1COcf/7K/fYiit1RexYl37K+TvnKxrsV+ZewbuFEG2ILNlOSBjXHFoZEbZYlzyvFmDl X-Received: by 2002:a05:6871:6b9e:b0:187:de63:134a with SMTP id zh30-20020a0568716b9e00b00187de63134amr3077022oab.18.1682709023524; Fri, 28 Apr 2023 12:10:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682709023; cv=none; d=google.com; s=arc-20160816; b=ZbURu8wVk6sBi5/dbNCRo5p+ekYp+qITxl3TLQZYJM4kZWA7UFh3+/XyGrp/AY6X+d ZcI2ItjZBS0mCVC8XQgzWTuZHi71PhER5MVuMk91wO/dv951upAm/QzaZFk8RiY5ED4p /aAIXCauTRVX8f8hZc9At9yy3WHtC+oPPM0rJtE9JRQZ9XSbOF3gNHWeIDyqRE2KRJOF OhkIqC6NKMbqpIBEDUtNrtNh57Gt3rcls+/twaB+uJaFByJW4nHmy1jBmxhTeHULSvVM gKPudpYOz6xNqgHP+tsT4yHLvNdP9fRjsTHmYIDvzPBaIEE72vHrdXZ228ORTQ1HM5F4 5rPw== 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:cc:to:from; bh=yJPCXJa4rjIyXzvHj+hxWNkecTVF8tZGuirBllvkL6U=; b=nhFSfBK2Hx9ZM5UH0HiggHAh/0uFM/QyeZ2zxRYnXf9ZgnbWyI3zAxbbL23t9XpHIO +/ld2EBjoPBmIHQen5vgnTcRqGdaXfjMHVCXRcCfZs8hXoDaQZf+oE7CLDvhJtwGNdR9 6Coa+jQyHzzi9XBSDBS677aGTpGM4cjaMaaEj4oLSPEBSZhNZtLhzxAn+kQ/hJyc+e9a pwBLcueWJL7fKl9STc6hWc4IDlJWUst3WjAMrwoJLXy6ZnND8nRlC9qTnPkcJgyWjtgX g1k3lhfRHHq++ilsmBK84ELDUvFFV/rXGcsJDPKssL9G670ueqLfjilEj1kEMzZk7kv9 FLgA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id hg11-20020a056870790b00b0018b205ed7c7si2001842oab.0.2023.04.28.12.10.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 28 Apr 2023 12:10:23 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@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 amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from user-B660.promwad.com (IN-213-226-141-183.bitemobile.lv [213.226.141.183] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 33SJA7FF011347 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 28 Apr 2023 21:10:17 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v1 08/10] meta-isar: Remove qemuamd64-sb settings from multiconfig Date: Fri, 28 Apr 2023 22:10:02 +0300 Message-Id: <20230428191004.243993-9-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230428191004.243993-1-amikan@ilbers.de> References: <20230428191004.243993-1-amikan@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: 7VIjoxf7lqjC Machine-related configuration should be done in machine config, so move it from multiconfig. Signed-off-by: Anton Mikanovich --- meta-isar/conf/machine/qemuamd64-sb.conf | 9 +++++++++ meta-isar/conf/multiconfig/qemuamd64-sb-bullseye.conf | 9 --------- 2 files changed, 9 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..5893aa55 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-sb-bullseye.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-sb-bullseye.conf @@ -1,12 +1,3 @@ # 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.34.1