From 8acba638489541c1b9a6123f98b346e5dd39420b Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin2.jansa@lgepartner.com>
Date: Sat, 1 Jul 2023 19:04:07 +0200
Subject: [PATCH] webos-raspberrypi: sdcard_image-rpi: include
 ${IMAGE_NAME_SUFFIX} directly in both ${IMAGE_NAME} and ${IMAGE_LINK_NAME}

:Release Notes:
Adjust to
https://git.openembedded.org/openembedded-core/commit/?id=26d97acc71379ab6702fa54a23b6542a3f51779c

:Detailed Notes:
* ${IMAGE_NAME}${IMAGE_NAME_SUFFIX} is almost always used together already
  and when they aren't it's usually because of hardcoded '.rootfs' suffix

* it's a bit strange, because ${IMAGE_NAME_SUFFIX} is applied after the
  version from ${IMAGE_VERSION_SUFFIX}, if we move it to ${IMAGE_LINK_NAME}
  then it will be applied before the version and ${IMAGE_LINK_NAME}
  will be just the version-less symlink to latest built version.

* it's not added to INITRAMFS_IMAGE_NAME as it assumes that all
  images used as initramfs will set IMAGE_NAME_SUFFIX to empty.
  Many already do as shown bellow, but you might need to extend
  this list in your layer.

* submitted upstream in:
  https://github.com/agherzan/meta-raspberrypi/pull/1289

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[WRQ-691] Create GPVB with Yocto 4.3 Nanbield

Change-Id: I7b9ba00ae83ac2a155f24602f5eb461de67eceea
---
 meta-webos-raspberrypi/classes/sdcard_image-rpi.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-webos-raspberrypi/classes/sdcard_image-rpi.bbclass b/meta-webos-raspberrypi/classes/sdcard_image-rpi.bbclass
index 62cb1d473..a1b0cd01b 100644
--- a/meta-webos-raspberrypi/classes/sdcard_image-rpi.bbclass
+++ b/meta-webos-raspberrypi/classes/sdcard_image-rpi.bbclass
@@ -63,7 +63,7 @@ do_image_rpi_sdimg[depends] = " \
 do_image_rpi_sdimg[recrdeps] = "do_build"
 
 # SD card image name
-SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.rpi-sdimg"
+SDIMG = "${IMGDEPLOYDIR}/${IMAGE_NAME}.rpi-sdimg"
 
 # Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS.
 FATPAYLOAD ?= ""