From cb8311ed40d263b6222aa3192dd3b4cc88cac9b7 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 18 Dec 2018 23:29:26 +0000 Subject: [PATCH] kernel-firmware: avoid word-splitting when processing filenames For example: brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt --- .../linux-firmware/kernel-firmware/package.mk | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/linux-firmware/kernel-firmware/package.mk b/packages/linux-firmware/kernel-firmware/package.mk index f8aaeccc5f..1e48567cf9 100644 --- a/packages/linux-firmware/kernel-firmware/package.mk +++ b/packages/linux-firmware/kernel-firmware/package.mk @@ -23,24 +23,25 @@ makeinstall_target() { fi for fwlist in ${FW_LISTS}; do - [ -f ${fwlist} ] || continue + [ -f "${fwlist}" ] || continue + while read -r fwline; do [ -z "${fwline}" ] && continue [[ ${fwline} =~ ^#.* ]] && continue [[ ${fwline} =~ ^[[:space:]] ]] && continue - for fwfile in $(cd ${PKG_BUILD} && eval "find ${fwline}"); do - [ -d ${PKG_BUILD}/${fwfile} ] && continue + while read -r fwfile; do + [ -d "${PKG_BUILD}/${fwfile}" ] && continue - if [ -f ${PKG_BUILD}/${fwfile} ]; then - mkdir -p $(dirname ${FW_TARGET_DIR}/${fwfile}) - cp -Lv ${PKG_BUILD}/${fwfile} ${FW_TARGET_DIR}/${fwfile} + if [ -f "${PKG_BUILD}/${fwfile}" ]; then + mkdir -p "$(dirname "${FW_TARGET_DIR}/${fwfile}")" + cp -Lv "${PKG_BUILD}/${fwfile}" "${FW_TARGET_DIR}/${fwfile}" else echo "ERROR: Firmware file ${fwfile} does not exist - aborting" exit 1 fi - done - done < ${fwlist} + done <<< "$(cd ${PKG_BUILD} && eval "find "${fwline}"")" + done < "${fwlist}" done # The following files are RPi specific and installed by brcmfmac_sdio-firmware-rpi instead.