[PATCH 2/4] Convert WIC_IMAGER_INSTALL to IMAGER_INSTALL:wic

[Jan Kiszka]

From: Jan Kiszka <jan.k...@siemens.com>

This variable exists for historic reasons and will soon be deprecated.
Convert own usage over.

Signed-off-by: Jan Kiszka <jan.k...@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