[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

linux-kernel-di and powerpc-small



Here is a small patch to linux-kernel-di, to build powerpc-small udebs.
Joey, can you commit this and use it in your next upload ? Any idea
about when it'll be ?

(it's trivial, but since the test cycle is quite long i thought it might
help you anyway)

And by the way, modules/powerpc/nic-modules-* should be renamed to
nic-*-modules, or they won't get built.

-- 
Jeremie Koenig <sprite@sprite.fr.eu.org>
Index: copy-modules
===================================================================
RCS file: /cvsroot/d-i/debian-installer/kernel/linux-kernel-di/copy-modules,v
retrieving revision 1.12
diff -u -r1.12 copy-modules
--- copy-modules	13 Nov 2003 19:54:59 -0000	1.12
+++ copy-modules	21 Jan 2004 17:03:19 -0000
@@ -52,6 +52,8 @@
 # The directory of modules lists to use.
 if [ -d modules/$arch-$flavour ]; then
 	modlistdir=modules/$arch-$flavour
+elif [ -d modules/$flavour ]; then
+	modlistdir=modules/$flavour
 else
 	modlistdir=modules/$arch
 fi
Index: gen-control
===================================================================
RCS file: /cvsroot/d-i/debian-installer/kernel/linux-kernel-di/gen-control,v
retrieving revision 1.4
diff -u -r1.4 gen-control
--- gen-control	10 Nov 2003 03:57:00 -0000	1.4
+++ gen-control	21 Jan 2004 17:03:19 -0000
@@ -71,6 +71,9 @@
 		if (-d "modules/$arch-$flavour") {
 			$modlistdir="modules/$arch-$flavour";
 		}
+		elsif (-d "modules/$flavour") {
+			$modlistdir="modules/$flavour";
+		}
 		else {
 			$modlistdir="modules/$arch";
 		}
Index: gen-deps
===================================================================
RCS file: /cvsroot/d-i/debian-installer/kernel/linux-kernel-di/gen-deps,v
retrieving revision 1.4
diff -u -r1.4 gen-deps
--- gen-deps	3 Nov 2003 21:40:49 -0000	1.4
+++ gen-deps	21 Jan 2004 17:03:19 -0000
@@ -25,6 +25,9 @@
 		if (-d "modules/$arch-$flavour") {
 			$modlistdir="modules/$arch-$flavour";
 		}
+		elsif (-d "modules/$flavour") {
+			$modlistdir="modules/$flavour";
+		}
 		else {
 			$modlistdir="modules/$arch";
 		}
Index: kernel-versions
===================================================================
RCS file: /cvsroot/d-i/debian-installer/kernel/linux-kernel-di/kernel-versions,v
retrieving revision 1.22
diff -u -r1.22 kernel-versions
--- kernel-versions	18 Jan 2004 02:26:45 -0000	1.22
+++ kernel-versions	21 Jan 2004 17:03:19 -0000
@@ -16,4 +16,4 @@
 mipsel   2.4.19   r3k-kn02   2.4.19-r3k-kn02      kernel-image-2.4.19-r3k-kn02
 mipsel   2.4.19   r4k-kn04   2.4.19-r4k-kn04      kernel-image-2.4.19-r4k-kn04
 powerpc  2.4.22   powerpc    2.4.22-powerpc       kernel-image-2.4.22-powerpc-pmac, kernel-modules-2.4.22-powerpc
-powerpc  2.4.22   small      2.4.22-powerpc-small kernel-image-2.4.22-powerpc-small-pmac, kernel-modules-2.4.22-powerpc-small
+powerpc  2.4.22 powerpc-small 2.4.22-powerpc-small kernel-image-2.4.22-powerpc-small-pmac, kernel-modules-2.4.22-powerpc-small

Reply to: