[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1116709: hw-detect: list_deb_firmware() does not find files in trixie packages after /usr merge



alexander barakin <alex@barak.in> writes:

>  list_deb_firmware () {
>  	udpkg -c "$1" \
> -		| grep '^\./lib/firmware/' \
> -		| sed -e 's!^\./lib/firmware/!!' \
> +		| grep '^\.\(/usr\)\?/lib/firmware/' \
> +		| sed -e 's!^\.\(/usr\)\?/lib/firmware/!!' \
>  		| grep -v '^$'
>  }

Here's a variation on that which avoids the `grep | sed | grep` pipe,
and takes advantage of the fact that we have support for -E in d-i.

  https://salsa.debian.org/installer-team/hw-detect/-/merge_requests/14

BTW I notice mentions of /lib/firmware in a few other places:

=-=-=-=
packages/hw-detect/check-missing-firmware.sh
184:        if [ ! -e /lib/firmware/$fwfile ] ; then
217:                    target="/lib/firmware${sdir:+/$sdir}"

packages/busybox/util-linux/mdev.c
64://config:    /lib/firmware/ and if it exists, send it to the kernel for
900: * - userspace checks /lib/firmware/$FIRMWARE
903: * - userspace copies /lib/firmware/$FIRMWARE into /sys/$DEVPATH/data
912:    /* check for /lib/firmware/$FIRMWARE */
914:    if (chdir("/lib/firmware") == 0)

installation-guide/en/using-d-i/loading-firmware.xml
31:copied to the correct location (<filename>/lib/firmware</filename>) and
=-=-=-=

do they also need fixing? (I'd guess that the symlinks mean this
shouldn't break things, but eventually we should probably settle on
using the real location)

Cheers, Phil.
-- 
Philip Hands -- https://hands.com/~phil


Reply to: