r2955 - in trunk/utils/initrd-tools: . debian

[Bastian Blank]

Author: waldi
Date: 2005-04-10 12:04:33 +0000 (Sun, 10 Apr 2005)
New Revision: 2955

Modified:
   trunk/utils/initrd-tools/debian/changelog
   trunk/utils/initrd-tools/mkinitrd
Log:
Always map sym53c8xx to sym53c8xx_2 for 2.4 kernels.

debian/changelog: Update.
mkinitrd: Add hack to select proper sym53c8xx variant.
Closes: 284961


Modified: trunk/utils/initrd-tools/debian/changelog
===================================================================
--- trunk/utils/initrd-tools/debian/changelog	2005-04-09 19:26:27 UTC (rev 2954)
+++ trunk/utils/initrd-tools/debian/changelog	2005-04-10 12:04:33 UTC (rev 2955)
@@ -1,3 +1,10 @@
+initrd-tools (0.1.78) UNRELEASED; urgency=high
+
+  * Bastian Blank
+    - Always map sym53c8xx to sym53c8xx_2 for 2.4 kernels. (closes: #284961)
+
+ -- Bastian Blank <waldi@debian.org>  Sun, 10 Apr 2005 14:03:43 +0200
+
 initrd-tools (0.1.77) unstable; urgency=high
 
   * Martin Michlmayr

Modified: trunk/utils/initrd-tools/mkinitrd
===================================================================
--- trunk/utils/initrd-tools/mkinitrd	2005-04-09 19:26:27 UTC (rev 2954)
+++ trunk/utils/initrd-tools/mkinitrd	2005-04-10 12:04:33 UTC (rev 2955)
@@ -576,6 +576,13 @@
 			sparc | sparc64) ARCH_ESP=esp ;;
 		esac
 
+		# XXX Workaround: 2.4 and 2.6 disagrees about the name of the new sym53c8xx module
+		if [ "$oldkernel" ]; then
+			sym53c8xx="sym53c8xx_2"
+		else
+			sym53c8xx="sym53c8xx"
+		fi
+
 		find /proc/scsi -type d -mindepth 1 -maxdepth 1 \
 			-printf "%f\n" | sed '
 				/^ide-scsi$/d
@@ -587,7 +594,7 @@
 				s/^isp1020$/qlogicisp/; t
 				s/^isp2x00$/qlogicfc/; t
 				s/^ncr53c7xx$/53c7,8xx/; t
-				s/^ncr53c8xx$/sym53c8xx/; t
+				s/^ncr53c8xx$/'$sym53c8xx'/; t
 				s/^A2091$/a2091/; t
 				s/^A3000$/a3000/; t
 				s/^Amiga7xx$/amiga7xx/; t
@@ -617,7 +624,8 @@
 qla2322\
 qla6312\
 qla6322/; t
-				s/^esp-oktagon$/octagon_esp/
+				s/^esp-oktagon$/octagon_esp/ t
+				s/^sym53c8xx.*$/'$sym53c8xx'/
 			' | tac
 
 #