Re: [PATCH 3/3] wic: clean up wic class in terms of isar variables

[Henning Schild <henning.schild@siemens.com>]

Am Thu, 26 Aug 2021 21:28:27 +0200
schrieb Henning Schild <henning.schild@siemens.com>:

> Move "KERNEL_FILE" into out Isar append, remove meanwhile unused
> variables from that append and add a comment to prevent further
> "messing" with forked bits.
> 
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>  meta/classes/wic-img.bbclass | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/classes/wic-img.bbclass
> b/meta/classes/wic-img.bbclass index f6413126167f..a49aa083e11c 100644
> --- a/meta/classes/wic-img.bbclass
> +++ b/meta/classes/wic-img.bbclass
> @@ -92,14 +92,14 @@ BUILDCHROOT_DIR = "${BUILDCHROOT_TARGET_DIR}"
>  
>  WIC_CREATE_EXTRA_ARGS ?= ""
>  
> +# taken from OE, do not touch directly
>  WICVARS += "\
>             BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD
> IMAGE_BASENAME IMAGE_BOOT_FILES \ IMAGE_LINK_NAME IMAGE_ROOTFS
> INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \
> -           ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR
> TARGET_SYS TRANSLATED_TARGET_ARCH \
> -           KERNEL_FILE"
> +           ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR
> TARGET_SYS TRANSLATED_TARGET_ARCH" 
>  # Isar specific vars used in our plugins
> -WICVARS += "KERNEL_IMAGE INITRD_IMAGE DISTRO DISTRO_ARCH"
> +WICVARS += "KERNEL_FILE"

This is going too far. DISTRO and DISTRO_ARCH are used in the efi
plugin and need to remain in the append.

Henning

>  
>  python do_rootfs_wicenv () {
>      wicvars = d.getVar('WICVARS', True)