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

[Bastian Blank]

Author: waldi
Date: 2005-04-10 13:24:09 +0000 (Sun, 10 Apr 2005)
New Revision: 2956

Modified:
   trunk/utils/initrd-tools/debian/changelog
   trunk/utils/initrd-tools/mkinitrd
Log:
Map between qlogicisp and qla1280 on alpha.

debian/changelog: Update.
mkinitrd: Add mapping for alpha between qlogicisp and qla1280 and handle downgrades.
Closes: 289995


Modified: trunk/utils/initrd-tools/debian/changelog
===================================================================
--- trunk/utils/initrd-tools/debian/changelog	2005-04-10 12:04:33 UTC (rev 2955)
+++ trunk/utils/initrd-tools/debian/changelog	2005-04-10 13:24:09 UTC (rev 2956)
@@ -2,6 +2,7 @@
 
   * Bastian Blank
     - Always map sym53c8xx to sym53c8xx_2 for 2.4 kernels. (closes: #284961)
+    - Map between qlogicisp and qla1280 on alpha. (closes: #289995)
 
  -- Bastian Blank <waldi@debian.org>  Sun, 10 Apr 2005 14:03:43 +0200
 

Modified: trunk/utils/initrd-tools/mkinitrd
===================================================================
--- trunk/utils/initrd-tools/mkinitrd	2005-04-10 12:04:33 UTC (rev 2955)
+++ trunk/utils/initrd-tools/mkinitrd	2005-04-10 13:24:09 UTC (rev 2956)
@@ -556,8 +556,21 @@
 			exit 1
 		fi
 
+		isp1020="qlogicisp"
+		qla1280="qla1280"
+
 		# Educate mkinitrd about different arches..
 		case "$(dpkg --print-architecture)" in
+			alpha)
+				# XXX Workaround: 2.6 qlogicisp is broken on alpha
+				# handle 2.6 -> 2.4
+				if dpkg --compare-versions $VERSION lt 2.5 && [ -z "$oldkernel" ]; then
+					qla1280='qla1280\nqlogicisp'
+				# handle 2.4 -> 2.6
+				elif dpkg --compare-versions $VERSION gt 2.5 && [ "$oldkernel" ]; then
+					isp1020="qla1280"
+				fi
+				;;
 			mips) ARCH_ESP=jazz_esp ;;
 			mipsel) ARCH_ESP=dec_esp ;;
 			m68k)
@@ -591,7 +604,7 @@
 				s/^aac$/aacraid/; t
 				s/^am53c974$/AM53C974/; t
 				s/^eata2x$/eata/; t
-				s/^isp1020$/qlogicisp/; t
+				s/^isp1020$/'$isp1020'/; t
 				s/^isp2x00$/qlogicfc/; t
 				s/^ncr53c7xx$/53c7,8xx/; t
 				s/^ncr53c8xx$/'$sym53c8xx'/; t
@@ -624,8 +637,9 @@
 qla2322\
 qla6312\
 qla6322/; t
-				s/^esp-oktagon$/octagon_esp/ t
-				s/^sym53c8xx.*$/'$sym53c8xx'/
+				s/^esp-oktagon$/octagon_esp/; t
+				s/^sym53c8xx.*$/'$sym53c8xx'/; t
+				s/^qla1280$/'$qla1280'/
 			' | tac
 
 #