From c89d46600a9348e84935e884a1912dda012c5980 Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Fri, 21 May 2021 13:28:32 +0200
Subject: [PATCH] u-boot-dey: append the graphic backend only to graphical
 images

Non-graphical images (core-image-base, dey-image-aws) don't contain the
graphic-backend on their filenames.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
---
 .../ccimx6ulsbc/install_linux_fw_uuu.sh           | 15 ++++++++++++---
 .../ccimx6ulstarter/install_linux_fw_uuu.sh       | 15 ++++++++++++---
 .../ccimx8mm-dvk/install_linux_fw_uuu.sh          | 15 ++++++++++++---
 .../ccimx8mn-dvk/install_linux_fw_uuu.sh          | 15 ++++++++++++---
 .../ccimx8x-sbc-express/install_linux_fw_uuu.sh   | 15 ++++++++++++---
 .../ccimx8x-sbc-pro/install_linux_fw_uuu.sh       | 15 ++++++++++++---
 6 files changed, 72 insertions(+), 18 deletions(-)

diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_uuu.sh
index 8695db08d..5ad4dfa77 100755
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_uuu.sh
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/install_linux_fw_uuu.sh
@@ -130,9 +130,18 @@ fi
 if [ -z "${IMAGE_NAME}" ]; then
 	IMAGE_NAME="dey-image-qt"
 fi
-INSTALL_LINUX_FILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##-ccimx6ulsbc.boot.ubifs"
-INSTALL_RECOVERY_FILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##-ccimx6ulsbc.recovery.ubifs"
-INSTALL_ROOTFS_FILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##-ccimx6ulsbc.ubifs"
+GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+for g in ${GRAPHICAL_IMAGES}; do
+	if [ "${IMAGE_NAME}" = "${g}" ]; then
+		BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##"
+	fi
+done
+if [ -z "${BASEFILENAME}" ]; then
+	BASEFILENAME="${IMAGE_NAME}"
+fi
+INSTALL_LINUX_FILENAME="${BASEFILENAME}-ccimx6ulsbc.boot.ubifs"
+INSTALL_RECOVERY_FILENAME="${BASEFILENAME}-ccimx6ulsbc.recovery.ubifs"
+INSTALL_ROOTFS_FILENAME="${BASEFILENAME}-ccimx6ulsbc.ubifs"
 
 # Verify existance of files before starting the update
 FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME} ${INSTALL_ROOTFS_FILENAME}"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_uuu.sh
index 1a73bfb1f..74d4e7dd2 100755
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_uuu.sh
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/install_linux_fw_uuu.sh
@@ -130,9 +130,18 @@ fi
 if [ -z "${IMAGE_NAME}" ]; then
 	IMAGE_NAME="core-image-base"
 fi
-INSTALL_LINUX_FILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##-ccimx6ulstarter.boot.ubifs"
-INSTALL_RECOVERY_FILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##-ccimx6ulstarter.recovery.ubifs"
-INSTALL_ROOTFS_FILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##-ccimx6ulstarter.ubifs"
+GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+for g in ${GRAPHICAL_IMAGES}; do
+	if [ "${IMAGE_NAME}" = "${g}" ]; then
+		BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##"
+	fi
+done
+if [ -z "${BASEFILENAME}" ]; then
+	BASEFILENAME="${IMAGE_NAME}"
+fi
+INSTALL_LINUX_FILENAME="${BASEFILENAME}-ccimx6ulstarter.boot.ubifs"
+INSTALL_RECOVERY_FILENAME="${BASEFILENAME}-ccimx6ulstarter.recovery.ubifs"
+INSTALL_ROOTFS_FILENAME="${BASEFILENAME}-ccimx6ulstarter.ubifs"
 
 # Verify existance of files before starting the update
 FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME} ${INSTALL_ROOTFS_FILENAME}"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/install_linux_fw_uuu.sh
index b827f6e47..22bd0cdb3 100755
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/install_linux_fw_uuu.sh
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/install_linux_fw_uuu.sh
@@ -88,9 +88,18 @@ fi
 if [ -z "${IMAGE_NAME}" ]; then
 	IMAGE_NAME="dey-image-qt"
 fi
-INSTALL_LINUX_FILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##-ccimx8mm-dvk.boot.vfat"
-INSTALL_RECOVERY_FILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##-ccimx8mm-dvk.recovery.vfat"
-INSTALL_ROOTFS_FILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##-ccimx8mm-dvk.ext4"
+GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+for g in ${GRAPHICAL_IMAGES}; do
+	if [ "${IMAGE_NAME}" = "${g}" ]; then
+		BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##"
+	fi
+done
+if [ -z "${BASEFILENAME}" ]; then
+	BASEFILENAME="${IMAGE_NAME}"
+fi
+INSTALL_LINUX_FILENAME="${BASEFILENAME}-ccimx8mm-dvk.boot.vfat"
+INSTALL_RECOVERY_FILENAME="${BASEFILENAME}-ccimx8mm-dvk.recovery.vfat"
+INSTALL_ROOTFS_FILENAME="${BASEFILENAME}-ccimx8mm-dvk.ext4"
 
 # Verify existance of files before starting the update
 FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME} ${INSTALL_ROOTFS_FILENAME}"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_uuu.sh
index 18924dbe5..e98aa9b2b 100755
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_uuu.sh
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/install_linux_fw_uuu.sh
@@ -88,9 +88,18 @@ fi
 if [ -z "${IMAGE_NAME}" ]; then
 	IMAGE_NAME="dey-image-qt"
 fi
-INSTALL_LINUX_FILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##-ccimx8mn-dvk.boot.vfat"
-INSTALL_RECOVERY_FILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##-ccimx8mn-dvk.recovery.vfat"
-INSTALL_ROOTFS_FILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##-ccimx8mn-dvk.ext4"
+GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+for g in ${GRAPHICAL_IMAGES}; do
+	if [ "${IMAGE_NAME}" = "${g}" ]; then
+		BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##"
+	fi
+done
+if [ -z "${BASEFILENAME}" ]; then
+	BASEFILENAME="${IMAGE_NAME}"
+fi
+INSTALL_LINUX_FILENAME="${BASEFILENAME}-ccimx8mn-dvk.boot.vfat"
+INSTALL_RECOVERY_FILENAME="${BASEFILENAME}-ccimx8mn-dvk.recovery.vfat"
+INSTALL_ROOTFS_FILENAME="${BASEFILENAME}-ccimx8mn-dvk.ext4"
 
 # Verify existance of files before starting the update
 FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME} ${INSTALL_ROOTFS_FILENAME}"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_uuu.sh
index e257149f6..af3a07ef6 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_uuu.sh
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_uuu.sh
@@ -150,9 +150,18 @@ fi
 if [ -z "${IMAGE_NAME}" ]; then
 	IMAGE_NAME="dey-image-qt"
 fi
-INSTALL_LINUX_FILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##-ccimx8x-sbc-express.boot.vfat"
-INSTALL_RECOVERY_FILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##-ccimx8x-sbc-express.recovery.vfat"
-INSTALL_ROOTFS_FILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##-ccimx8x-sbc-express.ext4"
+GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+for g in ${GRAPHICAL_IMAGES}; do
+	if [ "${IMAGE_NAME}" = "${g}" ]; then
+		BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##"
+	fi
+done
+if [ -z "${BASEFILENAME}" ]; then
+	BASEFILENAME="${IMAGE_NAME}"
+fi
+INSTALL_LINUX_FILENAME="${BASEFILENAME}-ccimx8x-sbc-express.boot.vfat"
+INSTALL_RECOVERY_FILENAME="${BASEFILENAME}-ccimx8x-sbc-express.recovery.vfat"
+INSTALL_ROOTFS_FILENAME="${BASEFILENAME}-ccimx8x-sbc-express.ext4"
 
 # Verify existance of files before starting the update
 FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME} ${INSTALL_ROOTFS_FILENAME}"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_uuu.sh
index f0cd26233..b84a25d11 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_uuu.sh
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_uuu.sh
@@ -150,9 +150,18 @@ fi
 if [ -z "${IMAGE_NAME}" ]; then
 	IMAGE_NAME="dey-image-qt"
 fi
-INSTALL_LINUX_FILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##-ccimx8x-sbc-pro.boot.vfat"
-INSTALL_RECOVERY_FILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##-ccimx8x-sbc-pro.recovery.vfat"
-INSTALL_ROOTFS_FILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##-ccimx8x-sbc-pro.ext4"
+GRAPHICAL_IMAGES="dey-image-qt dey-image-webkit"
+for g in ${GRAPHICAL_IMAGES}; do
+	if [ "${IMAGE_NAME}" = "${g}" ]; then
+		BASEFILENAME="${IMAGE_NAME}-##GRAPHICAL_BACKEND##"
+	fi
+done
+if [ -z "${BASEFILENAME}" ]; then
+	BASEFILENAME="${IMAGE_NAME}"
+fi
+INSTALL_LINUX_FILENAME="${BASEFILENAME}-ccimx8x-sbc-pro.boot.vfat"
+INSTALL_RECOVERY_FILENAME="${BASEFILENAME}-ccimx8x-sbc-pro.recovery.vfat"
+INSTALL_ROOTFS_FILENAME="${BASEFILENAME}-ccimx8x-sbc-pro.ext4"
 
 # Verify existance of files before starting the update
 FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME} ${INSTALL_ROOTFS_FILENAME}"