View | Details | Raw Unified | Return to bug 757655
Collapse All | Expand All

(-)file_not_specified_in_diff (-3 / +7 lines)
Line  Link Here
With udev 182, firmware is expected to be in /usr/lib/firmware.
With udev 182, firmware is expected to be in /usr/lib/firmware.
1
This patch adds the ability for it to look in /usr/lib/firmware, with
1
This patch adds the ability for it to look in /usr/lib/firmware, with
2
/lib/firmware as a fallback.
2
/lib/firmware as a fallback.
3
We use /path/to/firmware/ (trailing slash) so we follow the top
3
We use /path/to/firmware/ (trailing slash) so we follow the top
4
link with the name we used instead of the link target.
4
link with the name we used instead of the link target.
5
--
6
scripts/setup-modules.sh |    7 ++++++-
5
scripts/setup-modules.sh |    7 ++++++-
7
1 file changed, 6 insertions(+), 1 deletion(-)
6
1 file changed, 6 insertions(+), 1 deletion(-)
8
-- a/scripts/setup-modules.sh
7
++ b/scripts/setup-modules.sh
Lines 332-338 for module in $resolved_modules; do Link Here
332
    for fwl in $(modinfo -F firmware $module) ; do
332
    for fwl in $(modinfo -F firmware $module) ; do
333
       bmod=$(basename $module)
333
       bmod=$(basename $module)
334
       bfwl=$(basename $fwl)
334
       bfwl=$(basename $fwl)
335
       for fw in $(find /lib/firmware -name "$bfwl") ; do
335
336
       # Using find -L instead of a trailing slash means
337
       # we get /lib/firmware instead of /usr/lib/firmware.
338
       firmwaredir="/usr/lib/firmware/"
339
       [ -e "$firmwaredir" ] || firmwaredir="/lib/firmware/"
340
       for fw in $(find "$firmwaredir" -name "$bfwl") ; do
336
               cp -p --parents $fw $tmp_mnt
341
               cp -p --parents $fw $tmp_mnt
337
               echo -n "(module $bmod firmware $fw) "
342
               echo -n "(module $bmod firmware $fw) "
338
       done
343
       done

Return to bug 757655