diff options
author | Ross Burton <ross.burton@arm.com> | 2023-12-08 10:56:03 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-12-09 19:17:11 +0000 |
commit | c2f44a6e97397f5f3e8ff141874d733ca4a22d77 (patch) | |
tree | acedd136114380fb04d69619b1d0fcafb4302fe9 | |
parent | 78ef0313ee6add0301d866074c4b4a23dbefd757 (diff) | |
download | poky-c2f44a6e97397f5f3e8ff141874d733ca4a22d77.tar.gz |
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.
(From OE-Core rev: 68c2c9e9383fcd60434b101e7b7d7e811369dc0c)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
3 files changed, 0 insertions, 3 deletions
diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb index 7bb0b2738c..36e8771c4a 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 = "" | |||
20 | # Don't allow the initramfs to contain a kernel | 20 | # Don't allow the initramfs to contain a kernel |
21 | PACKAGE_EXCLUDE = "kernel-image-*" | 21 | PACKAGE_EXCLUDE = "kernel-image-*" |
22 | 22 | ||
23 | export IMAGE_BASENAME = "${MLPREFIX}core-image-minimal-initramfs" | ||
24 | IMAGE_NAME_SUFFIX ?= "" | 23 | IMAGE_NAME_SUFFIX ?= "" |
25 | IMAGE_LINGUAS = "" | 24 | IMAGE_LINGUAS = "" |
26 | 25 | ||
diff --git a/meta/recipes-core/images/core-image-tiny-initramfs.bb b/meta/recipes-core/images/core-image-tiny-initramfs.bb index 8af25f1b1f..7a71d55b1e 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 | |||
13 | # Do not pollute the initrd image with rootfs features | 13 | # Do not pollute the initrd image with rootfs features |
14 | IMAGE_FEATURES = "" | 14 | IMAGE_FEATURES = "" |
15 | 15 | ||
16 | export IMAGE_BASENAME = "core-image-tiny-initramfs" | ||
17 | IMAGE_NAME_SUFFIX ?= "" | 16 | IMAGE_NAME_SUFFIX ?= "" |
18 | IMAGE_LINGUAS = "" | 17 | IMAGE_LINGUAS = "" |
19 | 18 | ||
diff --git a/meta/recipes-extended/images/core-image-testcontroller-initramfs.bb b/meta/recipes-extended/images/core-image-testcontroller-initramfs.bb index a5b3d10205..3b81afd7c0 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 | |||
7 | # Do not pollute the initrd image with rootfs features | 7 | # Do not pollute the initrd image with rootfs features |
8 | IMAGE_FEATURES = "" | 8 | IMAGE_FEATURES = "" |
9 | 9 | ||
10 | export IMAGE_BASENAME = "core-image-testcontroller-initramfs" | ||
11 | IMAGE_NAME_SUFFIX ?= "" | 10 | IMAGE_NAME_SUFFIX ?= "" |
12 | IMAGE_LINGUAS = "" | 11 | IMAGE_LINGUAS = "" |
13 | 12 | ||