From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7299890018802204672 X-Received: by 2002:a05:600c:4446:b0:40a:392c:5b79 with SMTP id v6-20020a05600c444600b0040a392c5b79mr64376wmn.14.1699638091685; Fri, 10 Nov 2023 09:41:31 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1e08:b0:409:4d7e:9f0b with SMTP id ay8-20020a05600c1e0800b004094d7e9f0bls453293wmb.2.-pod-prod-04-eu; Fri, 10 Nov 2023 09:41:29 -0800 (PST) X-Google-Smtp-Source: AGHT+IH7tNyl/Y/cOB/221ktNis6dwQe/CwPvbU2CrUBBcF6jnMNI3He3AQjV+UCL3s0C1qXpW1T X-Received: by 2002:a05:600c:3c87:b0:402:8896:bb7b with SMTP id bg7-20020a05600c3c8700b004028896bb7bmr55657wmb.6.1699638089216; Fri, 10 Nov 2023 09:41:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699638089; cv=none; d=google.com; s=arc-20160816; b=t9/DVK9dLMAn83QKWOhWRBO5MWxGK+mJIx6o1bNwhDa48ls6Xd56ld2y/m8sQyff1z KgN6STaSB+2/1wCjDQJQSITeW1fJAu9wdx8F9LEwGEmIQuMGOd5h2WwQDxDJGBsOay0f JlTljSx+nCHYTy+Y4Y6SAvyxwk88DrwlGp6GknuPUC7hzwbu0t2PxKgsbykvDfWVQjHO iu90U7BSaocNBH0uL8bEC0A6EDoIGdVNFxs1xT6T4kiGd15XnQ9CEA8T5hvNKyBMDLps U0UDijPPNd4i0DV5r8wyVQ2+60U8RiBNRaF+ZX7mzexXEdWk+PMT2SL/hHLTWf77NwuG uvxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=ai82qqvgQxBTb+MjXxP9J/ovaeSRl6TERilFws4WIIE=; fh=jG0qHt3CTUMEKKl5ieAxjdiNuiHKpV9cWwyhjpouQSU=; b=YvhDdVIhCqrByOY4JCo/Sd2h3sx9555nCZ2200McrPeVn4bnp7nQnwwXMsPTYYSwjp hJxVCI1bfQ8fVBDQIXSvmaIDnA1XDEoZCmqD8bi22w/yGz7i5AwPVtn2tvJ8nXG3wy9N 4OWHZJBnjLPa0xcSyjBwx8Efr6N/w8k9z1bNm0urPVenI2QifUro5zT8pNtfQAB6WP7o fVK7NeW2ahFLiusNOP8YjMdKgfyT4lKPLnPWqj4qud6MslMerrmyvug1BavOFhIZ7pqu DjCElYjGZDujMTkxyLal92vyI3PC7tZU2zhJkjrewchuGvIP4Kl/R2TJPdeg8HHn3W9e Xamw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=ens9WKn+; spf=pass (google.com: domain of fm-294854-202311101741284f217e1af7850ca06f-e7kj2y@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-202311101741284f217e1af7850ca06f-e7KJ2Y@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id p5-20020a05600c1d8500b003fc39e1582fsi322900wms.1.2023.11.10.09.41.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Nov 2023 09:41:29 -0800 (PST) Received-SPF: pass (google.com: domain of fm-294854-202311101741284f217e1af7850ca06f-e7kj2y@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=ens9WKn+; spf=pass (google.com: domain of fm-294854-202311101741284f217e1af7850ca06f-e7kj2y@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-294854-202311101741284f217e1af7850ca06f-e7KJ2Y@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 202311101741284f217e1af7850ca06f for ; Fri, 10 Nov 2023 18:41:28 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=ai82qqvgQxBTb+MjXxP9J/ovaeSRl6TERilFws4WIIE=; b=ens9WKn+WCN4HY9KIfgy/dTM9OgODVPbjHukfGsAi1eLvMFS12aG/H30NQCeVbMtfUKidi 2gilaBGhTlDoUw87y/sIJ3zjx2IzeRq8X4npcud6svXGsqifqpDWYtGdqxM+h+ax6yl1eaGa y3HRfkQxoE41uBhuaKptuGGcGkGIA=; From: Jan Kiszka To: isar-users Cc: Adriaan Schmidt Subject: [PATCH 3/4] meta-isar: Limit wic-related imager dependencies to that image type Date: Fri, 10 Nov 2023 18:41:26 +0100 Message-Id: <906174dfb5f246307ca92656161224c8e563f01f.1699638087.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-TUID: JFEmXg12cESY From: Jan Kiszka We can now confine that dependencies needed for building the wic image are really only installed during that imaging step. Saves some time for building other image types. Signed-off-by: Jan Kiszka --- meta-isar/conf/machine/bananapi.conf | 2 +- meta-isar/conf/machine/de0-nano-soc.conf | 2 +- meta-isar/conf/machine/hikey.conf | 2 +- meta-isar/conf/machine/nanopi-neo-efi.conf | 2 +- meta-isar/conf/machine/nanopi-neo.conf | 2 +- meta-isar/conf/machine/qemuamd64-sb.conf | 4 ++-- meta-isar/conf/machine/qemuamd64.conf | 2 +- meta-isar/conf/machine/qemui386.conf | 2 +- meta-isar/conf/machine/sifive-fu540.conf | 2 +- meta-isar/conf/machine/starfive-visionfive2.conf | 2 +- meta-isar/conf/machine/stm32mp15x.conf | 2 +- meta-isar/conf/machine/virtualbox.conf | 2 +- meta-isar/conf/machine/vmware.conf | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/meta-isar/conf/machine/bananapi.conf b/meta-isar/conf/machine/bananapi.conf index 36cda28a..e48fe797 100644 --- a/meta-isar/conf/machine/bananapi.conf +++ b/meta-isar/conf/machine/bananapi.conf @@ -11,4 +11,4 @@ IMAGE_INSTALL += "u-boot-script" IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "bananapi" -IMAGER_INSTALL += "u-boot-sunxi" +IMAGER_INSTALL:wic += "u-boot-sunxi" diff --git a/meta-isar/conf/machine/de0-nano-soc.conf b/meta-isar/conf/machine/de0-nano-soc.conf index b298445b..78f841df 100644 --- a/meta-isar/conf/machine/de0-nano-soc.conf +++ b/meta-isar/conf/machine/de0-nano-soc.conf @@ -12,7 +12,7 @@ U_BOOT_BIN:de0-nano-soc = "u-boot-with-spl.sfp" IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "de0-nano-soc.wks.in" -IMAGER_INSTALL += "u-boot-de0-nano-soc" +IMAGER_INSTALL:wic += "u-boot-de0-nano-soc" IMAGER_BUILD_DEPS += "u-boot-de0-nano-soc" IMAGE_INSTALL += "u-boot-tools libubootenv-tool u-boot-script" diff --git a/meta-isar/conf/machine/hikey.conf b/meta-isar/conf/machine/hikey.conf index a606992f..019e1910 100644 --- a/meta-isar/conf/machine/hikey.conf +++ b/meta-isar/conf/machine/hikey.conf @@ -9,6 +9,6 @@ KERNEL_NAME ?= "mainline" IMAGE_FSTYPES = "wic" WKS_FILE ?= "hikey" -IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" +IMAGER_INSTALL:wic += "${GRUB_BOOTLOADER_INSTALL}" IMAGE_PREINSTALL:append = " firmware-ti-connectivity" diff --git a/meta-isar/conf/machine/nanopi-neo-efi.conf b/meta-isar/conf/machine/nanopi-neo-efi.conf index 1878c3cc..600f391b 100644 --- a/meta-isar/conf/machine/nanopi-neo-efi.conf +++ b/meta-isar/conf/machine/nanopi-neo-efi.conf @@ -10,4 +10,4 @@ KERNEL_NAME ?= "armmp" IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "nanopi-neo-efi.wks.in" -IMAGER_INSTALL += "u-boot-sunxi ${SYSTEMD_BOOTLOADER_INSTALL}" +IMAGER_INSTALL:wic += "u-boot-sunxi ${SYSTEMD_BOOTLOADER_INSTALL}" diff --git a/meta-isar/conf/machine/nanopi-neo.conf b/meta-isar/conf/machine/nanopi-neo.conf index 5aa717e5..855109fb 100644 --- a/meta-isar/conf/machine/nanopi-neo.conf +++ b/meta-isar/conf/machine/nanopi-neo.conf @@ -11,4 +11,4 @@ IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "nanopi-neo.wks.in" IMAGE_INSTALL += "u-boot-script" -IMAGER_INSTALL += "u-boot-sunxi" +IMAGER_INSTALL:wic += "u-boot-sunxi" diff --git a/meta-isar/conf/machine/qemuamd64-sb.conf b/meta-isar/conf/machine/qemuamd64-sb.conf index 0fa85155..2bec553b 100644 --- a/meta-isar/conf/machine/qemuamd64-sb.conf +++ b/meta-isar/conf/machine/qemuamd64-sb.conf @@ -8,13 +8,13 @@ WKS_FILE = "sdimage-efi-sb-debian" # use bootloader with signed boot support IMAGER_INSTALL:remove = "${GRUB_BOOTLOADER_INSTALL}" -IMAGER_INSTALL += "${GRUB_DEBIAN_SB_CHAIN}" +IMAGER_INSTALL:wic += "${GRUB_DEBIAN_SB_CHAIN}" # include public keys IMAGE_INSTALL += "sb-mok-public" # add MOK utilities to insert MOK into EFI -IMAGER_INSTALL += "${GRUB_DEBIAN_SB_MOK}" +IMAGER_INSTALL:wic += "${GRUB_DEBIAN_SB_MOK}" IMAGE_PREINSTALL += "mokutil" # overwrite qemu disk args for signed boot diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf index f417ce24..7d5987c6 100644 --- a/meta-isar/conf/machine/qemuamd64.conf +++ b/meta-isar/conf/machine/qemuamd64.conf @@ -7,7 +7,7 @@ KERNEL_NAME ?= "amd64" IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "sdimage-efi" -IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" +IMAGER_INSTALL:wic += "${GRUB_BOOTLOADER_INSTALL}" QEMU_ARCH ?= "x86_64" QEMU_MACHINE ?= "q35" diff --git a/meta-isar/conf/machine/qemui386.conf b/meta-isar/conf/machine/qemui386.conf index ddfc077b..85620258 100644 --- a/meta-isar/conf/machine/qemui386.conf +++ b/meta-isar/conf/machine/qemui386.conf @@ -6,7 +6,7 @@ KERNEL_NAME ?= "686-pae" IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "directdisk-isar" -IMAGER_INSTALL += "${SYSLINUX_BOOTLOADER_INSTALL}" +IMAGER_INSTALL:wic += "${SYSLINUX_BOOTLOADER_INSTALL}" QEMU_ARCH ?= "i386" QEMU_MACHINE ?= "pc" diff --git a/meta-isar/conf/machine/sifive-fu540.conf b/meta-isar/conf/machine/sifive-fu540.conf index 1eb58db1..c9bbc57b 100644 --- a/meta-isar/conf/machine/sifive-fu540.conf +++ b/meta-isar/conf/machine/sifive-fu540.conf @@ -9,7 +9,7 @@ KERNEL_NAME ?= "mainline" IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "sifive-fu540" -IMAGER_INSTALL += "opensbi-sifive-fu540" +IMAGER_INSTALL:wic += "opensbi-sifive-fu540" IMAGER_BUILD_DEPS += "opensbi-sifive-fu540" IMAGE_INSTALL += "u-boot-script" diff --git a/meta-isar/conf/machine/starfive-visionfive2.conf b/meta-isar/conf/machine/starfive-visionfive2.conf index 7393b1aa..d96041fc 100644 --- a/meta-isar/conf/machine/starfive-visionfive2.conf +++ b/meta-isar/conf/machine/starfive-visionfive2.conf @@ -10,7 +10,7 @@ KERNEL_NAME ?= "starfive" IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "starfive-visionfive2.wks.in" -IMAGER_INSTALL += " \ +IMAGER_INSTALL:wic += " \ jh7110-u-boot-spl-image \ visionfive2-u-boot-firmware \ ${SYSTEMD_BOOTLOADER_INSTALL}" diff --git a/meta-isar/conf/machine/stm32mp15x.conf b/meta-isar/conf/machine/stm32mp15x.conf index b91b5368..b10dead3 100644 --- a/meta-isar/conf/machine/stm32mp15x.conf +++ b/meta-isar/conf/machine/stm32mp15x.conf @@ -12,7 +12,7 @@ U_BOOT_BIN:stm32mp15x = "u-boot.stm32" IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "stm32mp15x.wks.in" -IMAGER_INSTALL += "trusted-firmware-a-stm32mp15x optee-os-stm32mp15x u-boot-stm32mp15x" +IMAGER_INSTALL:wic += "trusted-firmware-a-stm32mp15x optee-os-stm32mp15x u-boot-stm32mp15x" IMAGER_BUILD_DEPS += "trusted-firmware-a-stm32mp15x optee-os-stm32mp15x u-boot-stm32mp15x" IMAGE_INSTALL += "u-boot-script \ diff --git a/meta-isar/conf/machine/virtualbox.conf b/meta-isar/conf/machine/virtualbox.conf index de3d04c3..0e5f9e13 100644 --- a/meta-isar/conf/machine/virtualbox.conf +++ b/meta-isar/conf/machine/virtualbox.conf @@ -9,7 +9,7 @@ KERNEL_NAME ?= "amd64" WKS_FILE ?= "sdimage-efi" -IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" +IMAGER_INSTALL:wic += "${GRUB_BOOTLOADER_INSTALL}" VMDK_SUBFORMAT = "monolithicSparse" IMAGE_FSTYPES ?= "ova" diff --git a/meta-isar/conf/machine/vmware.conf b/meta-isar/conf/machine/vmware.conf index fba639b1..e363c024 100644 --- a/meta-isar/conf/machine/vmware.conf +++ b/meta-isar/conf/machine/vmware.conf @@ -9,7 +9,7 @@ KERNEL_NAME ?= "amd64" WKS_FILE ?= "sdimage-efi" -IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" +IMAGER_INSTALL:wic += "${GRUB_BOOTLOADER_INSTALL}" OVF_TEMPLATE_FILE ?= "vm-img-vmware.ovf.tmpl" -- 2.35.3