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

[Masanori Goto]

Author: gotom
Date: 2005-05-10 15:30:28 +0000 (Tue, 10 May 2005)
New Revision: 3032

Modified:
   trunk/utils/initrd-tools/TODO
   trunk/utils/initrd-tools/debian/changelog
   trunk/utils/initrd-tools/mkinitrd
Log:
Make mkinitrd work with new ldd format which change is introduced 
in glibc 2.3.4.  (Closes: #301455, #303281)
This change also fixes amd64 mkinitrd breakage.
(Closes: #279382, #292080, #295412, #295422, #297724)



Modified: trunk/utils/initrd-tools/TODO
===================================================================
--- trunk/utils/initrd-tools/TODO	2005-05-10 10:38:57 UTC (rev 3031)
+++ trunk/utils/initrd-tools/TODO	2005-05-10 15:30:28 UTC (rev 3032)
@@ -1,6 +1,4 @@
  sarge targeted items:
- 	* #298311 ldd fix for newer glibc
-	* #279382, #292080, #295422, #297724 ldd fix for amd64
 	* #272143, #266609, #263169, #264440 root on sata not found
 	* #283919 warn if root device is not found when dev nonexistent
 	* #284141 do not rely on /proc/scsi

Modified: trunk/utils/initrd-tools/debian/changelog
===================================================================
--- trunk/utils/initrd-tools/debian/changelog	2005-05-10 10:38:57 UTC (rev 3031)
+++ trunk/utils/initrd-tools/debian/changelog	2005-05-10 15:30:28 UTC (rev 3032)
@@ -1,3 +1,13 @@
+initrd-tools (0.1.80) unstable; urgency=low
+
+  * GOTO Masanori
+    - Make mkinitrd work with new ldd format which change is introduced 
+      in glibc 2.3.4.  (Closes: #301455, #303281)
+      This change also fixes amd64 mkinitrd breakage.
+      (Closes: #279382, #292080, #295412, #295422, #297724)
+
+ -- GOTO Masanori <gotom@debian.org>  Thu, 28 Apr 2005 10:52:00 +0900
+
 initrd-tools (0.1.79) unstable; urgency=high
 
   * Steve Langasek

Modified: trunk/utils/initrd-tools/mkinitrd
===================================================================
--- trunk/utils/initrd-tools/mkinitrd	2005-05-10 10:38:57 UTC (rev 3031)
+++ trunk/utils/initrd-tools/mkinitrd	2005-05-10 15:30:28 UTC (rev 3032)
@@ -1204,7 +1204,7 @@
 			add_command $i
 		done
 		exec 3>&-
-		< tmp2 sed 's/.*=>[[:blank:]]*\([^[:blank:]]*\).*/\1/'
+		< tmp2 sed 's/\(.*=>\)\?[[:blank:]]*\(.*\)[[:blank:]]\+\((.*)\)/\2/;/^$/d'
 
 		echo /dev/console
 		echo /dev/null