From 1204c236d861f8b28aeba6b0c53b8ac4d645fc3e Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Wed, 22 May 2019 17:24:01 +0200
Subject: [PATCH] firmware-qualcomm: remove 'cd' command from do_install()

The 'do_install()' call was doing a 'cd' command to later do symlinks
more straight forward.
This 'cd' however may affect further 'do_install' appends, that expect to
be working on the ${WORKDIR}.

Remove the 'cd' command and instead supply the correct paths to the 'ln'
commands.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
(cherry picked from commit 54bd1e47ad024515b737aea106dc4fca374c0fb8)
---
 .../firmware-qualcomm/firmware-qualcomm.bb        | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
index d6eca62fd..383c60370 100644
--- a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
+++ b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
@@ -62,23 +62,22 @@ do_install() {
 
 	# Wifi firmware
 	if [ "${QUALCOMM_WIFI_DRIVER}" = "community" ]; then
-		WIFI_FW_PATH="${D}${base_libdir}/firmware/ath10k/QCA6174/hw3.0"
+		WIFI_FW_PATH="${base_libdir}/firmware/ath10k/QCA6174/hw3.0"
 	else
-		WIFI_FW_PATH="${D}${base_libdir}/firmware"
+		WIFI_FW_PATH="${base_libdir}/firmware"
 	fi
-	install -d ${WIFI_FW_PATH}
+	install -d ${D}${WIFI_FW_PATH}
 	# Remove preceeding 'file://' from variable with files list
 	FW_WIFI_FILES="$(echo ${FW_QUALCOMM_WIFI} | sed -e 's,file\:\/\/,,g')"
-	install -m 0644 ${FW_WIFI_FILES} ${WIFI_FW_PATH}
-	cd ${WIFI_FW_PATH}
+	install -m 0644 ${FW_WIFI_FILES} ${D}${WIFI_FW_PATH}
 	if [ "${QUALCOMM_WIFI_DRIVER}" = "community" ]; then
 		# If using community driver, create symlink 'board.bin' to
 		# proprietary 'fakeboar.bin'
-		ln -s fakeboar.bin board.bin
+		ln -s fakeboar.bin ${D}${WIFI_FW_PATH}/board.bin
 	else
 		if [ "${FW_QUALCOMM_WIFI}" = "${FW_QCA6574_WIFI_PROPRIETARY}" ]; then
-			ln -s qwlan30.bin athwlan.bin
-			ln -s otp.bin athsetup.bin
+			ln -s qwlan30.bin ${D}${WIFI_FW_PATH}/athwlan.bin
+			ln -s otp.bin ${D}${WIFI_FW_PATH}/athsetup.bin
 		fi
 	fi
 }