Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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)
This commit is contained in:
Hector Palacios 2019-05-22 17:24:01 +02:00
parent c38b5a2f52
commit 1204c236d8
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
View File

@ -62,23 +62,22 @@ do_install() {
# Wifi firmware # Wifi firmware
if [ "${QUALCOMM_WIFI_DRIVER}" = "community" ]; then 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 else
WIFI_FW_PATH="${D}${base_libdir}/firmware" WIFI_FW_PATH="${base_libdir}/firmware"
fi fi
install -d ${WIFI_FW_PATH} install -d ${D}${WIFI_FW_PATH}
# Remove preceeding 'file://' from variable with files list # Remove preceeding 'file://' from variable with files list
FW_WIFI_FILES="$(echo ${FW_QUALCOMM_WIFI} | sed -e 's,file\:\/\/,,g')" FW_WIFI_FILES="$(echo ${FW_QUALCOMM_WIFI} | sed -e 's,file\:\/\/,,g')"
install -m 0644 ${FW_WIFI_FILES} ${WIFI_FW_PATH} install -m 0644 ${FW_WIFI_FILES} ${D}${WIFI_FW_PATH}
cd ${WIFI_FW_PATH}
if [ "${QUALCOMM_WIFI_DRIVER}" = "community" ]; then if [ "${QUALCOMM_WIFI_DRIVER}" = "community" ]; then
# If using community driver, create symlink 'board.bin' to # If using community driver, create symlink 'board.bin' to
# proprietary 'fakeboar.bin' # proprietary 'fakeboar.bin'
ln -s fakeboar.bin board.bin ln -s fakeboar.bin ${D}${WIFI_FW_PATH}/board.bin
else else
if [ "${FW_QUALCOMM_WIFI}" = "${FW_QCA6574_WIFI_PROPRIETARY}" ]; then if [ "${FW_QUALCOMM_WIFI}" = "${FW_QCA6574_WIFI_PROPRIETARY}" ]; then
ln -s qwlan30.bin athwlan.bin ln -s qwlan30.bin ${D}${WIFI_FW_PATH}/athwlan.bin
ln -s otp.bin athsetup.bin ln -s otp.bin ${D}${WIFI_FW_PATH}/athsetup.bin
fi fi
fi fi
} }