[kernel] r9754 - in dists/trunk/firmware-nonfree/debian: . templates

[Daniel Baumann]

Author: daniel
Date: Mon Nov 26 15:01:43 2007
New Revision: 9754

Log:
Check for already included firmware by initramfs-tools own functions (Closes: #440967).

Modified:
   dists/trunk/firmware-nonfree/debian/changelog
   dists/trunk/firmware-nonfree/debian/templates/hook.initramfs-tools.in

Modified: dists/trunk/firmware-nonfree/debian/changelog
==============================================================================
--- dists/trunk/firmware-nonfree/debian/changelog	(original)
+++ dists/trunk/firmware-nonfree/debian/changelog	Mon Nov 26 15:01:43 2007
@@ -2,6 +2,8 @@
 
   * Applying patch from Ben Hutchings <ben at decadent.org.uk> to update
     gencontrol.py for linux-support-2.6.22-3.
+  * Check for already included firmware by initramfs-tools own functions
+    (Closes: #440967).
 
  -- Daniel Baumann <daniel at debian.org>  Mon, 26 Nov 2007 15:58:00 +0100
 

Modified: dists/trunk/firmware-nonfree/debian/templates/hook.initramfs-tools.in
==============================================================================
--- dists/trunk/firmware-nonfree/debian/templates/hook.initramfs-tools.in	(original)
+++ dists/trunk/firmware-nonfree/debian/templates/hook.initramfs-tools.in	Mon Nov 26 15:01:43 2007
@@ -19,5 +19,11 @@
 copy_exec /lib/udev/firmware.agent /lib/udev/
 
 mkdir -p $DESTDIR/lib/firmware
-cp @files_real@ $DESTDIR/lib/firmware
 
+for FILE in @files_real@
+do
+	if [ ! -e $DESTDIR/lib/firmware/"`basename $FILE`" ]
+	then
+		cp "$FILE" $DESTDIR/lib/firmware
+	fi
+done