r1488 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series

[Sven Luther]

Author: luther
Date: 2004-08-31 03:34:18 -0600 (Tue, 31 Aug 2004)
New Revision: 1488

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-cmdline.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-6
Log:
Fixed broken commandline support on openfirmware powerpc.


Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-30 19:29:05 UTC (rev 1487)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-08-31 09:34:18 UTC (rev 1488)
@@ -20,8 +20,10 @@
 
   * Fix loop on hfs/hfsplus (closes: #261195) (Christoph Hellwig).
 
- -- 
+  * Fix default kernel boot args on openfirmware powerpc (Sven Luther).
 
+ -- Sven Luther <luther@debian.org>  Tue, 31 Aug 2004 11:29:36 +0200
+
 kernel-source-2.6.8 (2.6.8-5) unstable; urgency=high
 
   * Patches by the infintely wise and awesome David S. Miller:

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-cmdline.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-cmdline.dpatch	2004-08-30 19:29:05 UTC (rev 1487)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/powerpc-cmdline.dpatch	2004-08-31 09:34:18 UTC (rev 1488)
@@ -0,0 +1,20 @@
+#! /bin/sh -e 
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: Fix the CONFIG_CMDLINE which was broken on openfirmware powerpc.
+## DP: Patch author: Sven Luther <luther@debian.org>
+## DP: Upstream status: submitted to linuxppc-dev, awaiting feedback.
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+--- kernel-source-2.6.8.orig/arch/ppc/kernel/setup.c	2004-08-28 08:11:58.000000000 +0200
++++ kernel-source-2.6.8/arch/ppc/kernel/setup.c	2004-08-31 11:14:44.976745472 +0200
+@@ -418,7 +418,6 @@
+ 	 * are used for initrd_start and initrd_size,
+ 	 * otherwise they contain 0xdeadbeef.
+ 	 */
+-	cmd_line[0] = 0;
+ 	if (r3 >= 0x4000 && r3 < 0x800000 && r4 == 0) {
+ 		strlcpy(cmd_line, (char *)r3 + KERNELBASE,
+ 			sizeof(cmd_line));

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-6
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-6	2004-08-30 19:29:05 UTC (rev 1487)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-6	2004-08-31 09:34:18 UTC (rev 1488)
@@ -8,3 +8,4 @@
 + pcxx-is-broken.dpatch
 + microcode-devfs-name.dpatch
 + hfs-loop-fix.dpatch
++ powerpc-cmdline.dpatch