summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2023-03-13 13:15:34 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-03-22 13:53:29 +0000
commitda44a469f03b24ecfbb3d186b18115ff04188212 (patch)
tree8714954c3e187a6d4c42980d87bfb1d878239581
parenta2b8fec2891420f83031769de362c47a3cc88280 (diff)
downloadpoky-da44a469f03b24ecfbb3d186b18115ff04188212.tar.gz
image-artifact-names.bbclass: add INITRAMFS_IMAGE_NAME from kernel.bbclass
* move it from kernel.bbclass, because it needs to stay in sync with IMAGE_LINK_NAME structure * image-artifact-names.bbclass is also inheritted from kernel-artifact-names.bbclass so every recipe which needs this variable probably already inherits one of these * fixes kernel-fitimage.bbclass with modified IMAGE_LINK_NAME [YOCTO #12937] (From OE-Core rev: 432d0df0d771c8f0bef1e855ac6b0011b2c3cad2) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes-recipe/image-artifact-names.bbclass3
-rw-r--r--meta/classes-recipe/kernel.bbclass1
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes-recipe/image-artifact-names.bbclass b/meta/classes-recipe/image-artifact-names.bbclass
index 5c4e746b90..9dc25b6dde 100644
--- a/meta/classes-recipe/image-artifact-names.bbclass
+++ b/meta/classes-recipe/image-artifact-names.bbclass
@@ -14,6 +14,9 @@ IMAGE_VERSION_SUFFIX[vardepsexclude] += "DATETIME SOURCE_DATE_EPOCH"
14IMAGE_NAME ?= "${IMAGE_BASENAME}-${MACHINE}${IMAGE_VERSION_SUFFIX}" 14IMAGE_NAME ?= "${IMAGE_BASENAME}-${MACHINE}${IMAGE_VERSION_SUFFIX}"
15IMAGE_LINK_NAME ?= "${IMAGE_BASENAME}-${MACHINE}" 15IMAGE_LINK_NAME ?= "${IMAGE_BASENAME}-${MACHINE}"
16 16
17# This needs to stay in sync with IMAGE_LINK_NAME, but with INITRAMFS_IMAGE instead of IMAGE_BASENAME
18INITRAMFS_IMAGE_NAME ?= "${@['${INITRAMFS_IMAGE}-${MACHINE}', ''][d.getVar('INITRAMFS_IMAGE') == '']}"
19
17# IMAGE_NAME is the base name for everything produced when building images. 20# IMAGE_NAME is the base name for everything produced when building images.
18# The actual image that contains the rootfs has an additional suffix (.rootfs 21# The actual image that contains the rootfs has an additional suffix (.rootfs
19# by default) followed by additional suffices which describe the format (.ext4, 22# by default) followed by additional suffices which describe the format (.ext4,
diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass
index 92090ac14e..aefa0d21bc 100644
--- a/meta/classes-recipe/kernel.bbclass
+++ b/meta/classes-recipe/kernel.bbclass
@@ -33,7 +33,6 @@ INHIBIT_DEFAULT_DEPS = "1"
33 33
34KERNEL_IMAGETYPE ?= "zImage" 34KERNEL_IMAGETYPE ?= "zImage"
35INITRAMFS_IMAGE ?= "" 35INITRAMFS_IMAGE ?= ""
36INITRAMFS_IMAGE_NAME ?= "${@['${INITRAMFS_IMAGE}-${MACHINE}', ''][d.getVar('INITRAMFS_IMAGE') == '']}"
37INITRAMFS_TASK ?= "" 36INITRAMFS_TASK ?= ""
38INITRAMFS_IMAGE_BUNDLE ?= "" 37INITRAMFS_IMAGE_BUNDLE ?= ""
39INITRAMFS_DEPLOY_DIR_IMAGE ?= "${DEPLOY_DIR_IMAGE}" 38INITRAMFS_DEPLOY_DIR_IMAGE ?= "${DEPLOY_DIR_IMAGE}"