From 75960efc4415fe1e5c264202b259e5ca42fe2fe0 Mon Sep 17 00:00:00 2001
From: Matt Madison <matt@madison.systems>
Date: Tue, 4 Jul 2023 07:51:51 -0700
Subject: [PATCH] meta: rework image name usage for IMAGE_NAME_SUFFIX changes

OE-Core has reworked how the IMAGE_NAME and IMAGE_NAME_SUFFIX
variables are used - the suffix now gets embedded in IMAGE_NAME.
To account for this, adjust the tegra-specific image bbclasses
to drop ${IMAGE_NAME_SUFFIX} references, and adjust the recipes
for the ESP and initrd images to nullify IMAGE_NAME_SUFFIX, since
we don't really want '.rootfs' in the resultant artifact names
in those cases.

Signed-off-by: Matt Madison <matt@madison.systems>
---
 classes/image_types_cboot.bbclass                  |  2 +-
 classes/image_types_tegra.bbclass                  |  2 +-
 classes/image_types_tegra_esp.bbclass              | 14 +++++++-------
 recipes-bsp/uefi/tegra-espimage.bb                 |  1 +
 .../images/tegra-initrd-flash-initramfs.bb         |  1 +
 recipes-core/images/tegra-minimal-initramfs.bb     |  1 +
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/classes/image_types_cboot.bbclass b/classes/image_types_cboot.bbclass
index 0aee7064..c3b54baa 100644
--- a/classes/image_types_cboot.bbclass
+++ b/classes/image_types_cboot.bbclass
@@ -32,7 +32,7 @@ oe_cbootimg:tegra() {
 
 make_cboot_image() {
     local type="$1"
-    oe_cbootimg ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}
+    oe_cbootimg ${IMAGE_NAME}.${type}
 }
 make_cboot_image[vardepsexclude] += "DATETIME"
 
diff --git a/classes/image_types_tegra.bbclass b/classes/image_types_tegra.bbclass
index 43111252..0f2e4842 100644
--- a/classes/image_types_tegra.bbclass
+++ b/classes/image_types_tegra.bbclass
@@ -761,7 +761,7 @@ EOF
 
 create_bup_payload_image() {
     local type="$1"
-    oe_make_bup_payload ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}
+    oe_make_bup_payload ${IMGDEPLOYDIR}/${IMAGE_NAME}.${type}
     for f in ${WORKDIR}/bup-payload/*_only_payload; do
         [ -e $f ] || continue
         sfx=$(basename $f _payload)
diff --git a/classes/image_types_tegra_esp.bbclass b/classes/image_types_tegra_esp.bbclass
index 5355171b..4dd6249f 100644
--- a/classes/image_types_tegra_esp.bbclass
+++ b/classes/image_types_tegra_esp.bbclass
@@ -9,15 +9,15 @@ oe_mkespfs() {
 	fi
 
 	# Create a sparse image block.  ESP partition must be 64K blocks.
-	bbdebug 1 Executing "dd if=/dev/zero of=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype seek=65536 count=0 bs=1024"
-	dd if=/dev/zero of=${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype seek=65536 count=0 bs=1024
+	bbdebug 1 Executing "dd if=/dev/zero of=${IMGDEPLOYDIR}/${IMAGE_NAME}.$fstype seek=65536 count=0 bs=1024"
+	dd if=/dev/zero of=${IMGDEPLOYDIR}/${IMAGE_NAME}.$fstype seek=65536 count=0 bs=1024
 	bbdebug 1 "Actual Rootfs size:  `du -s ${IMAGE_ROOTFS}`"
-	bbdebug 1 "Actual Partition size: `stat -c '%s' ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype`"
-	bbdebug 1 Executing "mkfs.vfat -F 32 -I $extra_imagecmd ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype "
-	mkfs.vfat -F 32 -I $extra_imagecmd ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype
-	mcopy -i ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype -s ${IMAGE_ROOTFS}/* ::/
+	bbdebug 1 "Actual Partition size: `stat -c '%s' ${IMGDEPLOYDIR}/${IMAGE_NAME}.$fstype`"
+	bbdebug 1 Executing "mkfs.vfat -F 32 -I $extra_imagecmd ${IMGDEPLOYDIR}/${IMAGE_NAME}.$fstype "
+	mkfs.vfat -F 32 -I $extra_imagecmd ${IMGDEPLOYDIR}/${IMAGE_NAME}.$fstype
+	mcopy -i ${IMGDEPLOYDIR}/${IMAGE_NAME}.$fstype -s ${IMAGE_ROOTFS}/* ::/
 	# Error codes 0-3 indicate successfull operation of fsck (no errors or errors corrected)
-	fsck.vfat -pvfV ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.$fstype
+	fsck.vfat -pvfV ${IMGDEPLOYDIR}/${IMAGE_NAME}.$fstype
 }
 do_image_esp[depends] += "dosfstools-native:do_populate_sysroot mtools-native:do_populate_sysroot"
 IMAGE_TYPES += "esp"
diff --git a/recipes-bsp/uefi/tegra-espimage.bb b/recipes-bsp/uefi/tegra-espimage.bb
index b2a06443..8dd2d718 100644
--- a/recipes-bsp/uefi/tegra-espimage.bb
+++ b/recipes-bsp/uefi/tegra-espimage.bb
@@ -10,6 +10,7 @@ IMAGE_ROOTFS_SIZE = "65536"
 IMAGE_ROOTFS_MAXSIZE = "65536"
 IMAGE_ROOTFS_EXTRA_SPACE = "0"
 FORCE_RO_REMOVE = "1"
+IMAGE_NAME_SUFFIX = ""
 
 EFI_PROVIDER ??= "l4t-launcher"
 
diff --git a/recipes-core/images/tegra-initrd-flash-initramfs.bb b/recipes-core/images/tegra-initrd-flash-initramfs.bb
index 79a60d22..635b40c1 100644
--- a/recipes-core/images/tegra-initrd-flash-initramfs.bb
+++ b/recipes-core/images/tegra-initrd-flash-initramfs.bb
@@ -23,6 +23,7 @@ COMPATIBLE_MACHINE = "(tegra)"
 
 IMAGE_ROOTFS_SIZE = "32768"
 IMAGE_ROOTFS_EXTRA_SPACE = "0"
+IMAGE_NAME_SUFFIX = ""
 
 FORCE_RO_REMOVE ?= "1"
 
diff --git a/recipes-core/images/tegra-minimal-initramfs.bb b/recipes-core/images/tegra-minimal-initramfs.bb
index b821b7b4..f72a0759 100644
--- a/recipes-core/images/tegra-minimal-initramfs.bb
+++ b/recipes-core/images/tegra-minimal-initramfs.bb
@@ -25,6 +25,7 @@ KERNELDEPMODDEPEND = ""
 
 IMAGE_ROOTFS_SIZE = "32768"
 IMAGE_ROOTFS_EXTRA_SPACE = "0"
+IMAGE_NAME_SUFFIX = ""
 
 FORCE_RO_REMOVE ?= "1"