From dba3244a3ed7dcb2cacf626e6ef3786af4787569 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Fri, 31 Mar 2017 12:23:46 +0200
Subject: [PATCH] dey-image-installer: fix missing artifacts in ZIP installer

With the migration to Morty, some of the paths to the artifacts (boot
and rootfs images) need to be updated.

While on it, also remove the temporary README.txt file which is not
needed after it has been packed in the zip installer.

https://jira.digi.com/browse/DEL-4013

Signed-off-by: Javier Viguera <javier.viguera@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 9c29b4c65..e3d0f1f9e 100644
--- a/meta-digi-dey/classes/dey-image-installer.bbclass
+++ b/meta-digi-dey/classes/dey-image-installer.bbclass
@@ -22,8 +22,8 @@ generate_installer_zip () {
 	# Get list of files to pack
 	INSTALLER_FILELIST="${DEPLOY_DIR_IMAGE}/install_linux_fw_sd.scr"
 	for ext in ${FSTYPES_WHITELIST}; do
-		if readlink -e "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${ext}" >/dev/null; then
-			INSTALLER_FILELIST="${INSTALLER_FILELIST} ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${ext}"
+		if readlink -e "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${ext}" >/dev/null; then
+			INSTALLER_FILELIST="${INSTALLER_FILELIST} ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${ext}"
 		fi
 	done
 	for ubconf in ${UBOOT_CONFIG}; do
@@ -33,19 +33,20 @@ generate_installer_zip () {
 	done
 
 	# Create README file
-	cat >README.txt <<_EOF_
+	cat >${IMGDEPLOYDIR}/README.txt <<_EOF_
 Digi Embedded Yocto kit installer
 ---------------------------------
 
 _EOF_
-	md5sum ${INSTALLER_FILELIST} | sed -e "s,${DEPLOY_DIR_IMAGE}/,,g" >> README.txt
+	md5sum ${INSTALLER_FILELIST} | sed -e "s,${DEPLOY_DIR_IMAGE}/,,g;s,${IMGDEPLOYDIR}/,,g" >> ${IMGDEPLOYDIR}/README.txt
 
-	# Pack the files
-	zip -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.installer.zip ${INSTALLER_FILELIST} README.txt
+	# Pack the files and remove the temporary readme file
+	zip -j ${IMGDEPLOYDIR}/${IMAGE_NAME}.installer.zip ${INSTALLER_FILELIST} ${IMGDEPLOYDIR}/README.txt
+	rm -f ${IMGDEPLOYDIR}/README.txt
 
 	# Create the symlink
-	if [ -n "${IMAGE_LINK_NAME}" ] && [ -e "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.installer.zip" ]; then
-		ln -sf ${IMAGE_NAME}.installer.zip ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.installer.zip
+	if [ -n "${IMAGE_LINK_NAME}" ] && [ -e "${IMGDEPLOYDIR}/${IMAGE_NAME}.installer.zip" ]; then
+		ln -sf ${IMAGE_NAME}.installer.zip ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.installer.zip
 	fi
 }