From: Ross Burton Date: Fri, 8 Dec 2023 10:56:03 +0000 (+0000) Subject: images: remove redundant IMAGE_BASENAME assignments X-Git-Tag: yocto-5.2~4341 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=68c2c9e9383fcd60434b101e7b7d7e811369dc0c;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git images: remove redundant IMAGE_BASENAME assignments core-image-tiny-initramfs and core-image-testcontroller-initramfs just repeat PN, which is the default value. core-image-minimal-initramfs adds MLPREFIX, but that's also covered by PN: $ bitbake-getvar -r lib32-core-image-minimal-initramfs IMAGE_BASENAME IMAGE_BASENAME="lib32-core-image-minimal-initramfs" As these assignments are all redundant, remove them. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb index 7bb0b2738c7..36e8771c4ab 100644 --- a/meta/recipes-core/images/core-image-minimal-initramfs.bb +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb @@ -20,7 +20,6 @@ IMAGE_FEATURES = "" # Don't allow the initramfs to contain a kernel PACKAGE_EXCLUDE = "kernel-image-*" -export IMAGE_BASENAME = "${MLPREFIX}core-image-minimal-initramfs" IMAGE_NAME_SUFFIX ?= "" IMAGE_LINGUAS = "" diff --git a/meta/recipes-core/images/core-image-tiny-initramfs.bb b/meta/recipes-core/images/core-image-tiny-initramfs.bb index 8af25f1b1fe..7a71d55b1e8 100644 --- a/meta/recipes-core/images/core-image-tiny-initramfs.bb +++ b/meta/recipes-core/images/core-image-tiny-initramfs.bb @@ -13,7 +13,6 @@ PACKAGE_INSTALL = "initramfs-live-boot-tiny packagegroup-core-boot dropbear ${VI # Do not pollute the initrd image with rootfs features IMAGE_FEATURES = "" -export IMAGE_BASENAME = "core-image-tiny-initramfs" IMAGE_NAME_SUFFIX ?= "" IMAGE_LINGUAS = "" diff --git a/meta/recipes-extended/images/core-image-testcontroller-initramfs.bb b/meta/recipes-extended/images/core-image-testcontroller-initramfs.bb index a5b3d10205c..3b81afd7c07 100644 --- a/meta/recipes-extended/images/core-image-testcontroller-initramfs.bb +++ b/meta/recipes-extended/images/core-image-testcontroller-initramfs.bb @@ -7,7 +7,6 @@ PACKAGE_INSTALL = "initramfs-live-boot initramfs-live-install-testfs initramfs-l # Do not pollute the initrd image with rootfs features IMAGE_FEATURES = "" -export IMAGE_BASENAME = "core-image-testcontroller-initramfs" IMAGE_NAME_SUFFIX ?= "" IMAGE_LINGUAS = ""