tag 290329 + patch
thanks

Here is an idea:
(1) Revert the problem debian/rules change.

(2) Modify mkinitrd to set the default MODULES to dep or most based on
output of "dpkg-architecture -qDEB_HOST_ARCH"

(3) Comment out the MODLES= line in the config file and leavi it as an
example.

This is an UNTESTED patch to describe the fix better than the above
narative!

Alex Owen
diff -uNr initrd-tools-0.1.81.old/debian/rules initrd-tools-0.1.81/debian/rules
--- initrd-tools-0.1.81.old/debian/rules        2005-05-14 04:45:15.000000000 
+0100
+++ initrd-tools-0.1.81/debian/rules    2005-05-25 20:49:46.000000000 +0100
@@ -38,9 +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
+#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
diff -uNr initrd-tools-0.1.81.old/mkinitrd initrd-tools-0.1.81/mkinitrd
--- initrd-tools-0.1.81.old/mkinitrd    2005-05-23 04:43:04.000000000 +0100
+++ initrd-tools-0.1.81/mkinitrd        2005-05-25 20:57:03.000000000 +0100
@@ -24,6 +24,9 @@
 
 defaults() {
        MODULES=most
+       if [ "`/usr/bin/dpkg-architecture -qDEB_HOST_ARCH`" = "powerpc" ] ; then
+               MODULES=dep
+       fi
        DELAY=0
        ROOT=probe
        UMASK=022
diff -uNr initrd-tools-0.1.81.old/mkinitrd.conf 
initrd-tools-0.1.81/mkinitrd.conf
--- initrd-tools-0.1.81.old/mkinitrd.conf       2005-05-23 04:43:04.000000000 
+0100
+++ initrd-tools-0.1.81/mkinitrd.conf   2005-05-25 21:01:36.000000000 +0100
@@ -4,7 +4,13 @@
 # This file is meant to be parsed as a shell script.
 
 # What modules to install.
-MODULES=most
+# Uncomment and edit one of these lines to override the defaults for MODULES
+
+# Default for powerpc
+#MODULES=dep
+
+# Default for other architectures
+#MODULES=most
 
 # The length (in seconds) of the startup delay during which linuxrc may be
 # interrupted.

Reply via email to