diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2022-11-17 16:49:20 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2022-11-17 15:50:38 +0000 |
| commit | 8dd30fcf9026693f64311876ddfdca58756e5415 (patch) | |
| tree | 2316887bc9eeaff7916c7e2e42069c88946dd5fe | |
| parent | 78d231f9ca462dd3147ecb08b49e6740dc171d5b (diff) | |
| download | alpine-conf-8dd30fcf9026693f64311876ddfdca58756e5415.zip | |
update-kernel: handle firmware files with spaces
| -rwxr-xr-x | tests/bin/apk | 5 | ||||
| -rw-r--r-- | update-kernel.in | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/bin/apk b/tests/bin/apk index 5ac1a76..29da9ba 100755 --- a/tests/bin/apk +++ b/tests/bin/apk @@ -39,7 +39,10 @@ for pkg in $pkgs; do "$rootfs"/lib/firmware/brcm/brcmfmac43456-sdio.raspberrypi,400.clm_blob \ "$rootfs"/lib/firmware/brcm/brcmfmac43456-sdio.raspberrypi,400.txt \ "$rootfs"/lib/firmware/brcm/brcmfmac43752-sdio.bin \ - "$rootfs"/lib/firmware/brcm/brcmfmac43752-sdio.txt + "$rootfs"/lib/firmware/brcm/brcmfmac43752-sdio.txt \ + "$rootfs"/lib/firmware/brcm/"brcmfmac43455-sdio.Raspberry Pi Foundation-Raspberry Pi Compute Module 4.txt" \ + "$rootfs"/lib/firmware/brcm/brcmfmac43455-sdio.bin \ + "$rootfs"/lib/firmware/brcm/brcmfmac43455-sdio.clm_blob ;; linux-*) # simulate installing kernel diff --git a/update-kernel.in b/update-kernel.in index a6fecbb..0847ece 100644 --- a/update-kernel.in +++ b/update-kernel.in @@ -300,7 +300,7 @@ find $ROOTFS/lib/modules -type f -name "*.ko*" | xargs modinfo -k $KVER -F firmw if ! [ -e "$f" ]; then continue fi - install -pD "$f" $MODLOOP/modules/firmware/${f#*/lib/firmware} + install -pD "$f" "$MODLOOP/modules/firmware/${f#*/lib/firmware}" # copy also all potentially associated files for _file in "${f%.*}".*; do install -pD "$_file" "$MODLOOP/modules/firmware/${_file#*/lib/firmware/}" |