From 568d142b115e563237c71c171c4023c05a3959e8 Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Tue, 23 Jan 2024 15:52:35 +0100
Subject: [PATCH] ccimx6ul: remove "-x11" suffix from dey-image-lvgl image name

The ccimx6ul is the only platform that doesn't include a desktop backend in the
LVGL image, so remove the desktop backend suffix from the image's name. This
affects the image name itself, the corresponding SWU package and the
installation scripts.

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 meta-digi-arm/conf/machine/include/ccimx6ul.inc             | 4 ++++
 meta-digi-dey/recipes-core/images/dey-image-graphical.inc   | 5 +++--
 meta-digi-dey/recipes-core/images/dey-image-lvgl.bb         | 3 +++
 meta-digi-dey/recipes-digi/swu-images/dey-image-lvgl-swu.bb | 5 ++++-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
index f0e66256b..8bdbb3efe 100644
--- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc
@@ -77,3 +77,7 @@ UBOOT_ENV_RANGE ?= ""
 # Partitions to blacklist for swupdate:
 # bootloader, environment, safe
 SWUPDATE_MTD_BLACKLIST = "0 1 2"
+
+# ccimx6ul LVGL images don't have a desktop backend, so we don't need to append
+# "-x11" to the image name in the install scripts.
+GRAPHICAL_IMAGES:remove = "dey-image-lvgl"
diff --git a/meta-digi-dey/recipes-core/images/dey-image-graphical.inc b/meta-digi-dey/recipes-core/images/dey-image-graphical.inc
index 2856563ec..dde9d64de 100644
--- a/meta-digi-dey/recipes-core/images/dey-image-graphical.inc
+++ b/meta-digi-dey/recipes-core/images/dey-image-graphical.inc
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2016-2023 Digi International.
+# Copyright (C) 2016-2024 Digi International.
 #
 DESCRIPTION = "DEY image with graphical libraries"
 LICENSE = "MIT"
@@ -44,7 +44,8 @@ IMAGE_ROOTFS_SIZE = "8192"
 
 BAD_RECOMMENDATIONS += "eudev-hwdb"
 
-export IMAGE_BASENAME = "dey-image-${GRAPHICAL_CORE}-${GRAPHICAL_BACKEND}"
+DEFAULT_IMAGE_BASENAME ??= "dey-image-${GRAPHICAL_CORE}-${GRAPHICAL_BACKEND}"
+export IMAGE_BASENAME = "${DEFAULT_IMAGE_BASENAME}"
 
 CORE_IMAGE_EXTRA_INSTALL += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'weston-xwayland', '', d)} \
diff --git a/meta-digi-dey/recipes-core/images/dey-image-lvgl.bb b/meta-digi-dey/recipes-core/images/dey-image-lvgl.bb
index ee8695a1c..170ac4c5d 100644
--- a/meta-digi-dey/recipes-core/images/dey-image-lvgl.bb
+++ b/meta-digi-dey/recipes-core/images/dey-image-lvgl.bb
@@ -10,3 +10,6 @@ GRAPHICAL_CORE = "lvgl"
 # On the ccimx6ul, the only supported LVGL backend is fbdev, so there is no
 # need for a X11 desktop environment.
 IMAGE_FEATURES:remove:ccimx6ul = " x11-base x11-sato "
+
+# Remove GRAPHICAL_BACKEND suffix (-x11) from ccimx6ul image names
+DEFAULT_IMAGE_BASENAME:ccimx6ul = "dey-image-${GRAPHICAL_CORE}"
diff --git a/meta-digi-dey/recipes-digi/swu-images/dey-image-lvgl-swu.bb b/meta-digi-dey/recipes-digi/swu-images/dey-image-lvgl-swu.bb
index e402e85ad..a72daf561 100644
--- a/meta-digi-dey/recipes-digi/swu-images/dey-image-lvgl-swu.bb
+++ b/meta-digi-dey/recipes-digi/swu-images/dey-image-lvgl-swu.bb
@@ -1,5 +1,8 @@
-# Copyright (C) 2023 Digi International Inc.
+# Copyright (C) 2023,2024 Digi International Inc.
 
 require swu.inc
 
 IMG_NAME = "${@get_baseimg_pn(d)}-${GRAPHICAL_BACKEND}"
+
+# Remove GRAPHICAL_BACKEND suffix (-x11) from ccimx6ul image names
+IMG_NAME:ccimx6ul = "${@get_baseimg_pn(d)}"