From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Cc: Adriaan Schmidt <adriaan.schmidt@siemens.com>
Subject: [PATCH 3/4] meta-isar: Limit wic-related imager dependencies to that image type
Date: Fri, 10 Nov 2023 18:41:26 +0100 [thread overview]
Message-ID: <906174dfb5f246307ca92656161224c8e563f01f.1699638087.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1699638087.git.jan.kiszka@siemens.com>
From: Jan Kiszka <jan.kiszka@siemens.com>
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 <jan.kiszka@siemens.com>
---
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
next prev parent reply other threads:[~2023-11-10 17:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-10 17:41 [PATCH 0/4] IMAGER_INSTALL cleanups Jan Kiszka
2023-11-10 17:41 ` [PATCH 1/4] imagetypes_wic: Prepare for WIC_IMAGER_INSTALL being undefined Jan Kiszka
2023-11-10 17:41 ` [PATCH 2/4] Convert WIC_IMAGER_INSTALL to IMAGER_INSTALL:wic Jan Kiszka
2023-11-10 17:41 ` Jan Kiszka [this message]
2023-11-10 17:41 ` [PATCH 4/4] imagetypes_wic: Deprecate WIC_IMAGER_INSTALL Jan Kiszka
2023-11-10 22:00 ` Florian Bezdeka
2023-11-21 7:02 ` [PATCH 0/4] IMAGER_INSTALL cleanups Uladzimir Bely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=906174dfb5f246307ca92656161224c8e563f01f.1699638087.git.jan.kiszka@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=adriaan.schmidt@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox