Hello community, here is the log from the commit of package mkinitrd for openSUSE:Factory checked in at 2012-04-20 15:18:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old) and /work/SRC/openSUSE:Factory/.mkinitrd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mkinitrd", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes 2012-03-30 14:19:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes 2012-04-20 15:18:37.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 17 22:58:25 UTC 2012 - [email protected] + +- Change firmware search path to /usr/lib/firmware -- udev as of 182 + doesn't look in /lib/firmware (bnc#757655). + +------------------------------------------------------------------- New: ---- mkinitrd-firmware-in-usr ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.notIw8/_old 2012-04-20 15:18:38.000000000 +0200 +++ /var/tmp/diff_new_pack.notIw8/_new 2012-04-20 15:18:38.000000000 +0200 @@ -53,6 +53,7 @@ # silently overwritten by the next submission. Patch0: mkinitrd_cpbin_follow_link.patch Patch1: mkinitrd_simplify_netsetup.patch +Patch2: mkinitrd-firmware-in-usr Url: http://gitorious.org/opensuse/mkinitrd %description @@ -85,6 +86,7 @@ %setup %patch0 %patch1 +%patch2 -p1 %build %__cc $RPM_OPT_FLAGS -Wall -Os -o lib/mkinitrd/bin/run-init src/run-init.c ++++++ mkinitrd-firmware-in-usr ++++++ From: Jeff Mahoney <[email protected]> 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 <[email protected]> --- 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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
