Am Freitag, dem 11.10.2024 um 00:14 +0200 schrieb Petter Reinholdtsen:
> Here is a new and adjusted patch, making sure appstreamcli uses the C
> locale and trying to handle the wildcard firmware entries at least
> one
> of your machines driver kernel module mention. I am not sure if this
> last change is a useful approach, but thought it best to give it a
> go.
>
> diff --git a/isenkram-autoinstall-firmware
Sorry, I don't know, how to apply your patch correctly and there has
been errors:
# patch --dry-run /usr/sbin/isenkram-autoinstall-firmware
./isenkram.patch
checking file /usr/sbin/isenkram-autoinstall-firmware
Hunk #1 FAILED at 54.
Hunk #2 FAILED at 70.
Hunk #3 succeeded at 163 (offset 18 lines).
2 out of 3 hunks FAILED
Anyway:
I applied your changes by hand and I can confirm both problems are
gone:
# /usr/sbin/isenkram-autoinstall-firmware
info: looking for firmware file brcm/brcmfmac43241b5-sdio.LENOVO-
20C3S0HJ00.bin requested by kernel
info: looking for firmware file brcm/brcmfmac43241b5-sdio.LENOVO-
20C3S0HJ00.bin requested by kernel
info: looking for firmware file brcm/brcmfmac43241b5-sdio.LENOVO-
20C3S0HJ00.txt requested by kernel
info: looking for firmware file brcm/brcmfmac43241b5-sdio.LENOVO-
20C3S0HJ00.txt requested by kernel
info: looking for firmware file brcm/brcmfmac43241b5-sdio.txt requested
by kernel
info: looking for firmware file brcm/brcmfmac43241b5-sdio.txt requested
by kernel
info: looking for firmware file brcm/brcmfmac43241b5-sdio.LENOVO-
20C3S0HJ00.clm_blob requested by kernel
info: looking for firmware file brcm/brcmfmac43241b5-sdio.LENOVO-
20C3S0HJ00.clm_blob requested by kernel
info: looking for firmware file brcm/brcmfmac43241b5-sdio.clm_blob
requested by kernel
info: looking for firmware file brcm/brcmfmac43241b5-sdio.clm_blob
requested by kernel
info: looking for firmware file brcm/BCM4324B5.hcd requested by kernel
info: looking for firmware file brcm/BCM4324B5.hcd requested by kernel
info: some kernel driver requested extra firmware files:
brcm/brcmfmac*-pcie.*.bin brcm/brcmfmac*-pcie.*.clm_blob
brcm/brcmfmac*-pcie.*.txt brcm/brcmfmac*-pcie.txt brcm/brcmfmac*-
sdio.*.bin brcm/brcmfmac*-sdio.*.txt brcm/brcmfmac43430b0-sdio.bin
brcm/brcmfmac43439-sdio.bin brcm/brcmfmac43439-sdio.clm_blob
brcm/brcmfmac43456-sdio.bin brcm/brcmfmac4359-pcie.bin
brcm/brcmfmac4359-sdio.bin brcm/brcmfmac4364-pcie.bin
brcm/brcmfmac4365b-pcie.bin brcm/brcmfmac4365c-pcie.bin
brcm/brcmfmac43752-sdio.bin brcm/brcmfmac43752-sdio.clm_blob
brcm/brcmfmac4378b1-pcie.bin brcm/brcmfmac4378b1-pcie.clm_blob
brcm/brcmfmac89459-pcie.bin rtl_bt/rtl8723b_config.bin
rtl_bt/rtl8723bs_config.bin rtl_bt/rtl8723cs_cg_config.bin
rtl_bt/rtl8723cs_cg_fw.bin rtl_bt/rtl8723cs_vf_config.bin
rtl_bt/rtl8723cs_vf_fw.bin rtl_bt/rtl8723ds_config.bin
rtl_bt/rtl8723ds_fw.bin rtl_bt/rtl8761a_config.bin
rtl_bt/rtl8821cs_config.bin rtl_bt/rtl8821cs_fw.bin
rtl_bt/rtl8851bu_config.bin rtl_bt/rtl8851bu_fw.bin
brcm/brcmfmac43241b5-sdio.LENOVO-20C3S0HJ00.bin brcm/brcmfmac43241b5-
sdio.LENOVO-20C3S0HJ00.bin brcm/brcmfmac43241b5-sdio.LENOVO-
20C3S0HJ00.txt brcm/brcmfmac43241b5-sdio.LENOVO-20C3S0HJ00.txt
brcm/brcmfmac43241b5-sdio.txt brcm/brcmfmac43241b5-sdio.txt
brcm/brcmfmac43241b5-sdio.LENOVO-20C3S0HJ00.clm_blob
brcm/brcmfmac43241b5-sdio.LENOVO-20C3S0HJ00.clm_blob
brcm/brcmfmac43241b5-sdio.clm_blob brcm/brcmfmac43241b5-sdio.clm_blob
brcm/BCM4324B5.hcd brcm/BCM4324B5.hcd
info: locating packages with the requested firmware files
info: determining whether enabling other components is required
info: No new firmware package with requested firmware detected.
So since your syntax 'diff --git /usr/sbin/isenkram-autoinstall-
firmware.*' give an error on my system (unknown option »--git«), I did
a diff for myself to show you that I followed your changes
Some line numbers are different, but I think thats the difference
between debian stable and git development:
# diff /usr/sbin/isenkram-autoinstall-firmware.*
57c57
< appstreamcli what-provides firmware:runtime "$fwfile" | \
---
> LC_ALL=C appstreamcli what-provides firmware:runtime "$fwfile" |
\
62,63c62,63
< for fwfile in $(for module in $(awk '{print $1}' /proc/modules) ; do
modinfo $module 2>/dev/null |awk '/^firmware:/ {print $2}'; done|sort -
u); do
< if [ ! -e /lib/firmware/$fwfile ] ; then
---
> for fwfile in $(for module in $(awk '{print $1}' /proc/modules) ; do
modinfo $module 2>/dev/null |awk '/^firmware:/ {print $2}'; done|
LC_ALL=C sort -u); do
> if [ ! -e "/lib/firmware/$fwfile" ] ; then
73c73
< if [ ! -e /lib/firmware/$fwfile ] ; then
---
> if [ ! -e "/lib/firmware/$fwfile" ] ; then
166c166
< binpkginfos=$(echo "$binpkginfos" | tr ' ' '\n' | sort -u | xargs)
---
> binpkginfos=$(echo "$binpkginfos" | tr ' ' '\n' | LC_ALL=C sort -u |
xargs)
Thank you,
Christian
