From 49dbae051ee20437ceba2e211398cb157340d5a2 Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Tue, 8 Nov 2022 17:00:00 +0100
Subject: [PATCH] dey-image-installer: fix recipe to add USB driver
 installation script

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 .../classes/dey-image-installer.bbclass         | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/meta-digi-dey/classes/dey-image-installer.bbclass b/meta-digi-dey/classes/dey-image-installer.bbclass
index 4e6332613..c060f973b 100644
--- a/meta-digi-dey/classes/dey-image-installer.bbclass
+++ b/meta-digi-dey/classes/dey-image-installer.bbclass
@@ -25,6 +25,10 @@ FSTYPES_WHITELIST:ccmp1 = " \
     ubifs \
 "
 
+HAS_USB_DRIVER = "false"
+HAS_USB_DRIVER:ccimx8m = "true"
+HAS_USB_DRIVER:ccmp1 = "true"
+
 generate_installer_zip () {
 	# Get list of files to pack
 	INSTALLER_FILELIST="${DEPLOY_DIR_IMAGE}/install_linux_fw_sd.scr \
@@ -33,6 +37,11 @@ generate_installer_zip () {
 	if readlink -e "${DEPLOY_DIR_IMAGE}/install_linux_fw_uuu.sh"; then
 		INSTALLER_FILELIST="${INSTALLER_FILELIST} ${DEPLOY_DIR_IMAGE}/install_linux_fw_uuu.sh"
 	fi
+	# Get USB driver installation script
+	if ${HAS_USB_DRIVER}; then
+		INSTALLER_FILELIST="${INSTALLER_FILELIST} ${META_DIGI_SCRIPTS}/install_usb_driver.sh"
+	fi
+
 	# Decompress the ext4.gz image, if any
 	if readlink -e "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ext4.gz" >/dev/null; then
 		gzip -d -k -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ext4.gz
@@ -71,12 +80,4 @@ _EOF_
 	fi
 }
 
-generate_installer_zip:append:ccimx8m () {
-	INSTALLER_FILELIST=${META_DIGI_SCRIPTS}/install_usb_driver.sh
-}
-
-generate_installer_zip:append:ccmp1 () {
-	INSTALLER_FILELIST=${META_DIGI_SCRIPTS}/install_usb_driver.sh
-}
-
 IMAGE_POSTPROCESS_COMMAND += "generate_installer_zip; "