r3093 - trunk/utils/initrd-tools/debian

[Sven Luther]

Author: luther
Date: 2005-05-13 09:44:47 +0000 (Fri, 13 May 2005)
New Revision: 3093

Modified:
   trunk/utils/initrd-tools/debian/changelog
   trunk/utils/initrd-tools/debian/rules
Log:
Changed changelog entry to UNRELEASED.
Now powerpc defaults to MODULES=dep as they should.


Modified: trunk/utils/initrd-tools/debian/changelog
===================================================================
--- trunk/utils/initrd-tools/debian/changelog	2005-05-13 09:42:38 UTC (rev 3092)
+++ trunk/utils/initrd-tools/debian/changelog	2005-05-13 09:44:47 UTC (rev 3093)
@@ -6,7 +6,7 @@
       this avoids breaking lvm2 volumes in 2.4 when the lvm10 package
       is installed.  Closes: #291386.
   * GOTO Masanori
-    - Make mkinitrd work with new ldd format which change is introduced 
+    - 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)
@@ -16,13 +16,15 @@
       * Take /etc/mkinitrd/DSDT and put it in the initrd if it exists.
       * Use mktemp, not $$ for creating temporary directories.
     - Function module_exist recognizes modules in subdirs. Closes: #296894
-    - Fix upgrade path from woody for sparc arch. thanks to 
+    - Fix upgrade path from woody for sparc arch. thanks to
       Jurij Smakov <jurij@wooyd.org> Closes: #306219
     - Use libdevmapper1.01 Closes: #266591, #298727, #303401
     - Fix permissions of the initrd files. thanks to patch for debian/rules
       from Horms <horms@debian.org> Closes: #285767
+  * Sven Luther
+    - Powerpc now defaults to MODULES=dep. (Closes: #290329)
 
- -- Steve Langasek <vorlon@debian.org>  Sun, 10 Apr 2005 15:38:08 -0700
+ -- Sven Luther <luther@debian.org>  Fri, 13 May 2005 11:39:55 +0200
 
 initrd-tools (0.1.78) unstable; urgency=high
 

Modified: trunk/utils/initrd-tools/debian/rules
===================================================================
--- trunk/utils/initrd-tools/debian/rules	2005-05-13 09:42:38 UTC (rev 3092)
+++ trunk/utils/initrd-tools/debian/rules	2005-05-13 09:44:47 UTC (rev 3093)
@@ -10,6 +10,8 @@
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=3
 
+DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
 build binary-indep:
 # Ye olde no-op.
 
@@ -36,6 +38,9 @@
 		mkinitrd debian/initrd-tools/usr/sbin/
 	install -o root -g root -m 644 \
 		mkinitrd.conf modules debian/initrd-tools/etc/mkinitrd/
+ifeq ($(DEB_HOST_ARCH),powerpc)
+	sed -i -e 's%MODULES=most%MODULES=dep%' debian/initrd-tools/etc/mkinitrd/mkinitrd.conf
+endif
 
 # Build architecture-dependent files here.
 binary-arch: build install