Hello community,
here is the log from the commit of package mkinitrd for openSUSE:Factory
checked in at 2013-08-04 20:40:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mkinitrd (Old)
and /work/SRC/openSUSE:Factory/.mkinitrd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mkinitrd"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mkinitrd/mkinitrd.changes 2013-08-04
16:58:28.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mkinitrd.new/mkinitrd.changes 2013-08-04
23:52:30.000000000 +0200
@@ -1,0 +2,10 @@
+Sun Aug 4 16:29:03 CEST 2013 - oher...@suse.de
+
+- Print copied firmware files only once
+
+-------------------------------------------------------------------
+Sun Aug 4 16:27:35 CEST 2013 - oher...@suse.de
+
+- Include firmware files only once, in /lib/firmware (bnc#713126)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mkinitrd.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkinitrd-2.7.2/mkinitrd.changes
new/mkinitrd-2.7.2/mkinitrd.changes
--- old/mkinitrd-2.7.2/mkinitrd.changes 2013-08-04 10:47:54.000000000 +0200
+++ new/mkinitrd-2.7.2/mkinitrd.changes 2013-08-04 16:30:17.000000000 +0200
@@ -1,4 +1,14 @@
-------------------------------------------------------------------
+Sun Aug 4 16:29:03 CEST 2013 - oher...@suse.de
+
+- Print copied firmware files only once
+
+-------------------------------------------------------------------
+Sun Aug 4 16:27:35 CEST 2013 - oher...@suse.de
+
+- Include firmware files only once, in /lib/firmware (bnc#713126)
+
+-------------------------------------------------------------------
Sun Aug 4 10:47:08 CEST 2013 - oher...@suse.de
- Fix parsing of disabled modules in RESOLVED_INITRD_MODULES (bnc#696959)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mkinitrd-2.7.2/scripts/setup-modules.sh
new/mkinitrd-2.7.2/scripts/setup-modules.sh
--- old/mkinitrd-2.7.2/scripts/setup-modules.sh 2013-08-04 10:47:54.000000000
+0200
+++ new/mkinitrd-2.7.2/scripts/setup-modules.sh 2013-08-04 16:30:17.000000000
+0200
@@ -320,6 +320,10 @@
# Copy all modules into the initrd
has_firmware=false
+declare -A fw_array
+mkdir -p $tmp_mnt/lib/firmware
+mkdir -p $tmp_mnt/usr/lib
+ln -sfbn ../../lib/firmware $tmp_mnt/usr/lib/firmware
for module in $resolved_modules; do
if [ ! -r $root_dir/$module ]; then
oops 9 "Module $module not found."
@@ -340,7 +344,11 @@
echo -ne "Firmware:\t"
has_firmware=true
fi
- echo -n "$fw "
+ if test -z "${fw_array[$fw]}"
+ then
+ fw_array[$fw]=$fw
+ echo -n "$fw "
+ fi
if test -e "$dir/$subdir/$fw.sig"; then
cp -p --parents "$_" "$tmp_mnt"
echo -n "$fw.sig "
@@ -354,6 +362,7 @@
echo
fi
unset has_firmware
+unset fw_array
if [ "$resolved_modules" ] ; then
[ ! -d $tmp_mnt/lib/modules/$kernel_version ] && oops 10 "No modules have
been installed"
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
