* [PATCH 0/4] IMAGER_INSTALL cleanups
@ 2023-11-10 17:41 Jan Kiszka
2023-11-10 17:41 ` [PATCH 1/4] imagetypes_wic: Prepare for WIC_IMAGER_INSTALL being undefined Jan Kiszka
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Jan Kiszka @ 2023-11-10 17:41 UTC (permalink / raw)
To: isar-users; +Cc: Adriaan Schmidt
This consolidates wic-related dependencies over IMAGER_INSTALL:wic and
also deprecates WIC_IMAGER_INSTALL.
Jan
Jan Kiszka (4):
imagetypes_wic: Prepare for WIC_IMAGER_INSTALL being undefined
Convert WIC_IMAGER_INSTALL to IMAGER_INSTALL:wic
meta-isar: Limit wic-related imager dependencies to that image type
imagetypes_wic: Deprecate WIC_IMAGER_INSTALL
RECIPE-API-CHANGELOG.md | 6 ++++++
meta-isar/classes/rpi-sdimg.bbclass | 12 +++++------
meta-isar/conf/distro/ubuntu-common.inc | 2 +-
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/rpi-common.conf | 12 +++++------
meta-isar/conf/machine/sifive-fu540.conf | 2 +-
.../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 +-
meta/classes/imagetypes_wic.bbclass | 5 ++++-
meta/conf/distro/debian-common.conf | 20 +++++++++----------
meta/conf/distro/debian-sid-ports.conf | 2 +-
20 files changed, 48 insertions(+), 39 deletions(-)
--
2.35.3
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/4] imagetypes_wic: Prepare for WIC_IMAGER_INSTALL being undefined
2023-11-10 17:41 [PATCH 0/4] IMAGER_INSTALL cleanups Jan Kiszka
@ 2023-11-10 17:41 ` Jan Kiszka
2023-11-10 17:41 ` [PATCH 2/4] Convert WIC_IMAGER_INSTALL to IMAGER_INSTALL:wic Jan Kiszka
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Jan Kiszka @ 2023-11-10 17:41 UTC (permalink / raw)
To: isar-users; +Cc: Adriaan Schmidt
From: Jan Kiszka <jan.kiszka@siemens.com>
We will migrate WIC_IMAGER_INSTALL to IMAGER_INSTALL:wic, and that can
leave the old variable unset behind.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
meta/classes/imagetypes_wic.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/imagetypes_wic.bbclass b/meta/classes/imagetypes_wic.bbclass
index 6b50959f..e150c0e9 100644
--- a/meta/classes/imagetypes_wic.bbclass
+++ b/meta/classes/imagetypes_wic.bbclass
@@ -83,7 +83,7 @@ python () {
bb.build.addtask('do_transform_template', 'do_image_wic', None, d)
}
-IMAGER_INSTALL:wic += "${WIC_IMAGER_INSTALL}"
+IMAGER_INSTALL:wic += "${@d.getVar('WIC_IMAGER_INSTALL') or ''}"
# wic comes with reasonable defaults, and the proper interface is the wks file
ROOTFS_EXTRA ?= "0"
--
2.35.3
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/4] Convert WIC_IMAGER_INSTALL to IMAGER_INSTALL:wic
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 ` Jan Kiszka
2023-11-10 17:41 ` [PATCH 3/4] meta-isar: Limit wic-related imager dependencies to that image type Jan Kiszka
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Jan Kiszka @ 2023-11-10 17:41 UTC (permalink / raw)
To: isar-users; +Cc: Adriaan Schmidt
From: Jan Kiszka <jan.kiszka@siemens.com>
This variable exists for historic reasons and will soon be deprecated.
Convert own usage over.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
meta-isar/classes/rpi-sdimg.bbclass | 12 ++++++------
meta-isar/conf/distro/ubuntu-common.inc | 2 +-
meta-isar/conf/machine/rpi-common.conf | 12 ++++++------
meta/conf/distro/debian-common.conf | 20 ++++++++++----------
meta/conf/distro/debian-sid-ports.conf | 2 +-
5 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/meta-isar/classes/rpi-sdimg.bbclass b/meta-isar/classes/rpi-sdimg.bbclass
index d8163a47..fc63f7f9 100644
--- a/meta-isar/classes/rpi-sdimg.bbclass
+++ b/meta-isar/classes/rpi-sdimg.bbclass
@@ -7,12 +7,12 @@ IMAGE_TYPEDEP:rpi_sdimg = "wic"
WKS_FILE ?= "rpi-sdimg"
-WIC_IMAGER_INSTALL = "parted \
- dosfstools \
- mtools \
- e2fsprogs \
- python3-distutils \
- bmap-tools"
+IMAGER_INSTALL:wic += "parted \
+ dosfstools \
+ mtools \
+ e2fsprogs \
+ python3-distutils \
+ bmap-tools"
IMAGE_BOOT_FILES ?= "${IMAGE_ROOTFS}/boot/*.*;./ \
${IMAGE_ROOTFS}/boot/overlays/*;overlays/"
diff --git a/meta-isar/conf/distro/ubuntu-common.inc b/meta-isar/conf/distro/ubuntu-common.inc
index 6a990a89..9d8a843b 100644
--- a/meta-isar/conf/distro/ubuntu-common.inc
+++ b/meta-isar/conf/distro/ubuntu-common.inc
@@ -31,4 +31,4 @@ DISTRO_KERNELS ?= " \
IMAGE_PREINSTALL += "init"
IMAGE_PREINSTALL += "initramfs-tools"
-WIC_IMAGER_INSTALL += "python3-distutils"
+IMAGER_INSTALL:wic += "python3-distutils"
diff --git a/meta-isar/conf/machine/rpi-common.conf b/meta-isar/conf/machine/rpi-common.conf
index 078ea195..ba5047ce 100644
--- a/meta-isar/conf/machine/rpi-common.conf
+++ b/meta-isar/conf/machine/rpi-common.conf
@@ -18,12 +18,12 @@ IMAGE_PREINSTALL += "raspberrypi-bootloader \
IMAGE_INSTALL += "bootconfig-${MACHINE}"
-WIC_IMAGER_INSTALL = "parted \
- dosfstools \
- mtools \
- e2fsprogs \
- python3-distutils \
- bmap-tools"
+IMAGER_INSTALL:wic += "parted \
+ dosfstools \
+ mtools \
+ e2fsprogs \
+ python3-distutils \
+ bmap-tools"
IMAGE_BOOT_FILES ?= "${IMAGE_ROOTFS}/boot/*.*;./ \
${IMAGE_ROOTFS}/boot/overlays/*;overlays/"
diff --git a/meta/conf/distro/debian-common.conf b/meta/conf/distro/debian-common.conf
index 5610dcd4..1e1dfc83 100644
--- a/meta/conf/distro/debian-common.conf
+++ b/meta/conf/distro/debian-common.conf
@@ -12,16 +12,16 @@ DISTRO_APT_SOURCES ?= "conf/distro/${BASE_DISTRO}-${BASE_DISTRO_CODENAME}.list"
IMAGE_PREINSTALL += "init"
-WIC_IMAGER_INSTALL = "parted \
- gdisk \
- util-linux \
- dosfstools \
- mtools \
- e2fsprogs \
- python3-distutils \
- bmap-tools \
- tar \
- fdisk"
+IMAGER_INSTALL:wic += "parted \
+ gdisk \
+ util-linux \
+ dosfstools \
+ mtools \
+ e2fsprogs \
+ python3-distutils \
+ bmap-tools \
+ tar \
+ fdisk"
GRUB_BOOTLOADER_INSTALL:amd64 = "grub-efi-amd64-bin"
GRUB_BOOTLOADER_INSTALL:i386 = "grub-efi-ia32-bin"
diff --git a/meta/conf/distro/debian-sid-ports.conf b/meta/conf/distro/debian-sid-ports.conf
index b1709098..8a0b3a98 100644
--- a/meta/conf/distro/debian-sid-ports.conf
+++ b/meta/conf/distro/debian-sid-ports.conf
@@ -24,4 +24,4 @@ THIRD_PARTY_APT_KEYS += "${DEBIAN_PORTS_KEYS}"
IMAGE_PREINSTALL += "init"
-WIC_IMAGER_INSTALL += "python3-distutils"
+IMAGER_INSTALL:wic += "python3-distutils"
--
2.35.3
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 3/4] meta-isar: Limit wic-related imager dependencies to that image type
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
2023-11-10 17:41 ` [PATCH 4/4] imagetypes_wic: Deprecate WIC_IMAGER_INSTALL Jan Kiszka
2023-11-21 7:02 ` [PATCH 0/4] IMAGER_INSTALL cleanups Uladzimir Bely
4 siblings, 0 replies; 7+ messages in thread
From: Jan Kiszka @ 2023-11-10 17:41 UTC (permalink / raw)
To: isar-users; +Cc: Adriaan Schmidt
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 4/4] imagetypes_wic: Deprecate WIC_IMAGER_INSTALL
2023-11-10 17:41 [PATCH 0/4] IMAGER_INSTALL cleanups Jan Kiszka
` (2 preceding siblings ...)
2023-11-10 17:41 ` [PATCH 3/4] meta-isar: Limit wic-related imager dependencies to that image type Jan Kiszka
@ 2023-11-10 17:41 ` Jan Kiszka
2023-11-10 22:00 ` Florian Bezdeka
2023-11-21 7:02 ` [PATCH 0/4] IMAGER_INSTALL cleanups Uladzimir Bely
4 siblings, 1 reply; 7+ messages in thread
From: Jan Kiszka @ 2023-11-10 17:41 UTC (permalink / raw)
To: isar-users; +Cc: Adriaan Schmidt
From: Jan Kiszka <jan.kiszka@siemens.com>
Issue a warning that suggests the now preferred alternative if it is
still used but keep it functioning.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
RECIPE-API-CHANGELOG.md | 6 ++++++
meta/classes/imagetypes_wic.bbclass | 3 +++
2 files changed, 9 insertions(+)
diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
index b1699be6..fa73cb57 100644
--- a/RECIPE-API-CHANGELOG.md
+++ b/RECIPE-API-CHANGELOG.md
@@ -554,3 +554,9 @@ Default value is '-I' which sets filter to:
-I.cvsignore -I.deps -I.git -I.gitattributes -I.gitignore -I.gitmodules
-I.gitreview -I.hg -I.hgignore -I.hgsigs -I.hgtags -I.mailmap -I.mtn-ignore
-I.shelf -I.svn -ICVS -IDEADJOE -IRCS -I_MTN -I_darcs -I{arch}
+
+### WIC_IMAGER_INSTALL is deprecated
+
+Use `IMAGER_INSTALL:wic` instead of `WIC_IMAGER_INSTALL?. The latter is still
+supported, but a warning is issued when it is used. Future versions will drop
+`WIC_IMAGER_INSTALL` completely.
diff --git a/meta/classes/imagetypes_wic.bbclass b/meta/classes/imagetypes_wic.bbclass
index e150c0e9..4c74f166 100644
--- a/meta/classes/imagetypes_wic.bbclass
+++ b/meta/classes/imagetypes_wic.bbclass
@@ -19,6 +19,9 @@ python () {
if not d.getVar('USING_WIC') == '1':
return
+ if d.getVar('WIC_IMAGER_INSTALL'):
+ bb.warn("WIC_IMAGER_INSTALL is deprecated, use IMAGER_INSTALL:wic instead")
+
import itertools
import re
--
2.35.3
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 4/4] imagetypes_wic: Deprecate WIC_IMAGER_INSTALL
2023-11-10 17:41 ` [PATCH 4/4] imagetypes_wic: Deprecate WIC_IMAGER_INSTALL Jan Kiszka
@ 2023-11-10 22:00 ` Florian Bezdeka
0 siblings, 0 replies; 7+ messages in thread
From: Florian Bezdeka @ 2023-11-10 22:00 UTC (permalink / raw)
To: Jan Kiszka, isar-users; +Cc: Adriaan Schmidt
On Fri, 2023-11-10 at 18:41 +0100, 'Jan Kiszka' via isar-users wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> Issue a warning that suggests the now preferred alternative if it is
> still used but keep it functioning.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> RECIPE-API-CHANGELOG.md | 6 ++++++
> meta/classes/imagetypes_wic.bbclass | 3 +++
> 2 files changed, 9 insertions(+)
>
> diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
> index b1699be6..fa73cb57 100644
> --- a/RECIPE-API-CHANGELOG.md
> +++ b/RECIPE-API-CHANGELOG.md
> @@ -554,3 +554,9 @@ Default value is '-I' which sets filter to:
> -I.cvsignore -I.deps -I.git -I.gitattributes -I.gitignore -I.gitmodules
> -I.gitreview -I.hg -I.hgignore -I.hgsigs -I.hgtags -I.mailmap -I.mtn-ignore
> -I.shelf -I.svn -ICVS -IDEADJOE -IRCS -I_MTN -I_darcs -I{arch}
> +
> +### WIC_IMAGER_INSTALL is deprecated
> +
> +Use `IMAGER_INSTALL:wic` instead of `WIC_IMAGER_INSTALL?. The latter is still
^ typo
> +supported, but a warning is issued when it is used. Future versions will drop
> +`WIC_IMAGER_INSTALL` completely.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/4] IMAGER_INSTALL cleanups
2023-11-10 17:41 [PATCH 0/4] IMAGER_INSTALL cleanups Jan Kiszka
` (3 preceding siblings ...)
2023-11-10 17:41 ` [PATCH 4/4] imagetypes_wic: Deprecate WIC_IMAGER_INSTALL Jan Kiszka
@ 2023-11-21 7:02 ` Uladzimir Bely
4 siblings, 0 replies; 7+ messages in thread
From: Uladzimir Bely @ 2023-11-21 7:02 UTC (permalink / raw)
To: Jan Kiszka, isar-users
On Fri, 2023-11-10 at 18:41 +0100, 'Jan Kiszka' via isar-users wrote:
> This consolidates wic-related dependencies over IMAGER_INSTALL:wic
> and
> also deprecates WIC_IMAGER_INSTALL.
>
> Jan
>
> Jan Kiszka (4):
> imagetypes_wic: Prepare for WIC_IMAGER_INSTALL being undefined
> Convert WIC_IMAGER_INSTALL to IMAGER_INSTALL:wic
> meta-isar: Limit wic-related imager dependencies to that image type
> imagetypes_wic: Deprecate WIC_IMAGER_INSTALL
>
> RECIPE-API-CHANGELOG.md | 6 ++++++
> meta-isar/classes/rpi-sdimg.bbclass | 12 +++++------
> meta-isar/conf/distro/ubuntu-common.inc | 2 +-
> 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/rpi-common.conf | 12 +++++------
> meta-isar/conf/machine/sifive-fu540.conf | 2 +-
> .../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 +-
> meta/classes/imagetypes_wic.bbclass | 5 ++++-
> meta/conf/distro/debian-common.conf | 20 +++++++++--------
> --
> meta/conf/distro/debian-sid-ports.conf | 2 +-
> 20 files changed, 48 insertions(+), 39 deletions(-)
>
> --
> 2.35.3
>
Applied to next (with typo fix in p4), thanks
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-11-21 7:02 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PATCH 3/4] meta-isar: Limit wic-related imager dependencies to that image type Jan Kiszka
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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox