From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7243694205603676160 X-Received: by 2002:ac8:5994:0:b0:3f8:365:7a99 with SMTP id e20-20020ac85994000000b003f803657a99mr5930830qte.55.1686817182435; Thu, 15 Jun 2023 01:19:42 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac8:4904:0:b0:3f5:3b17:86be with SMTP id e4-20020ac84904000000b003f53b1786bels298447qtq.0.-pod-prod-09-us; Thu, 15 Jun 2023 01:19:41 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6VZSQnSMDQvMdRb2YBI6Zx1VGJ6QPYSQGESmiu0L2gNUWiqn6oWP6rW4P2J8zNsFLMw98P X-Received: by 2002:ac8:5e0b:0:b0:3e8:38fc:e8cf with SMTP id h11-20020ac85e0b000000b003e838fce8cfmr5423930qtx.22.1686817181608; Thu, 15 Jun 2023 01:19:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686817181; cv=none; d=google.com; s=arc-20160816; b=uuWxB80U1O3g2gw4rkK7Ao4stWw7hUcpvQ9ssNjX0K5hTd7VHOj/ZNaQFAW731Z4eK AZh6yKEFnUuE5X8MYRBYT5kBDNnW7M2QL/AYP/U92rWdvY7CkvmAmkQDJLCbKD0QpvfP bzHM76bhAVRYC/9z5Hq4BY65b6QVeyvNElvOHPzyjZiY3vj8Pn9gpyPZIFieJRV9kCqU fHNZEHKjWKT0LRZb78x41zaH1caWq49ybWni/WqkLQXqK6HSFjBxAwnCrCNCxvX2vOJI XeXMMJQxuGs4tUlHxCyqOhLPBWE03KIruuyOV70vDmNaYm+FHL4DItG3dBPHFIMACgN1 bPzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id; bh=bIqAobcExQIc/yenZn7FyuqaVkLty5+sreS0rMrsSJo=; b=lMP5YgK4eU9cdylDhD8pEprbnVsULVxaNaoNSHU4H4hvEcZfqhahm1moPfIdzStSf4 5N1T+6LghToenBoH6ECCjnxb5D/VIaL/d+Z8gzQ2tk8DFNQqBIGgs7cOmgcsXRCh8Bwd 3KkwEZhvg/sWxiJZU5vOu4LU7G8aCbuaHx82HJYY+u0B09cDJrQQ5V7yyoKpowsjJjHK 0a3mguJKBpkWKUwgXu60dpX2qCWYvuM6pLuyRWGYy4rNSn2FOTNfjTQvczX8+uRIJKRr puAiRYRehlxwiFbsBElv/8WKf8SdZvWRIjHHEqOxw4/qmPSqhWwXkw3yFeMUEdp7Bn8X JJog== 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 g28-20020ac84b7c000000b003f393f04011si1209278qts.0.2023.06.15.01.19.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Jun 2023 01:19:41 -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 [127.0.0.1] (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 35F8JXX7025604 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Jun 2023 10:19:34 +0200 Message-ID: <606804d4-0116-98ec-14f7-dacf71273481@ilbers.de> Date: Thu, 15 Jun 2023 11:19:33 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [PATCH v3 08/10] meta-isar: Remove qemuamd64-sb settings from multiconfig To: Jan Kiszka , Uladzimir Bely , isar-users@googlegroups.com References: <20230612071256.8688-1-ubely@ilbers.de> <20230612071256.8688-9-ubely@ilbers.de> <9f692085-26e8-adde-b5a4-698b87052760@siemens.com> Content-Language: en-US, ru-RU From: Anton Mikanovich In-Reply-To: <9f692085-26e8-adde-b5a4-698b87052760@siemens.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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: hYkuUmc/x4Rf 15/06/2023 08:07, 'Jan Kiszka' via isar-users wrote: > On 12.06.23 09:12, Uladzimir Bely wrote: >> 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" > This is an anti-pattern when you want to allow reusing the machine > configs outside of Isar testing scenarios, see also [1]. > > Jan > > [1] > https://groups.google.com/d/msgid/isar-users/b37eca8a55e91777ec3fdb54c989326b54c0253f.1685895669.git.jan.kiszka%40siemens.com > Hello Jan, one of the main ideas here was to cleanup all the multiconfigs to enable building images with local.conf machine+distro values only. But qemuamd64-sb-bullseye is really special target currently. If we move those options to isar-image-ci recipe the target will be unusable without meta-test layer. All other targets are buildable even without meta-test which allows this new layer to be optional.