Attachment 486551 Details for Bug 757655

[patch] [PATCH] mkinitrd: Firmware in /usr/lib/firmware

mkinitrd-firmware-in-usr (text/plain), 1.20 KB, created by Jeff Mahoney on 2012-04-17 23:58:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Mahoney

Created: 2012-04-17 23:58:59 UTC

Size: 1.20 KB

patch

obsolete

>From: Jeff Mahoney <jeffm@suse.com>
>Subject: mkinitrd: Firmware in /usr/lib/firmware
>References: bnc#757655
>
> With udev 182, firmware is expected to be in /usr/lib/firmware.
>
> This patch adds the ability for it to look in /usr/lib/firmware, with
> /lib/firmware as a fallback.
>
> We use /path/to/firmware/ (trailing slash) so we follow the top
> link with the name we used instead of the link target.
>
>Signed-off-by: Jeff Mahoney <jeffm@suse.com>
>---
> scripts/setup-modules.sh |    7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
>--- a/scripts/setup-modules.sh
>+++ b/scripts/setup-modules.sh
>@@ -332,7 +332,12 @@ for module in $resolved_modules; do
>     for fwl in $(modinfo -F firmware $module) ; do
>        bmod=$(basename $module)
>        bfwl=$(basename $fwl)
>-       for fw in $(find /lib/firmware -name "$bfwl") ; do
>+
>+       # Using find -L instead of a trailing slash means
>+       # we get /lib/firmware instead of /usr/lib/firmware.
>+       firmwaredir="/usr/lib/firmware/"
>+       [ -e "$firmwaredir" ] || firmwaredir="/lib/firmware/"
>+       for fw in $(find "$firmwaredir" -name "$bfwl") ; do
>                cp -p --parents $fw $tmp_mnt
>                echo -n "(module $bmod firmware $fw) "
>        done

Actions: View | Diff

Attachments on bug 757655: 486551