[kernel] r4895 - in dists/trunk/linux-2.6/debian: . patches-debian patches-debian/series

[Sven Luther]

Author: luther
Date: Thu Nov 24 18:31:34 2005
New Revision: 4895

Added:
   dists/trunk/linux-2.6/debian/patches-debian/powerpc-arch-default-powerpc.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc2-0experimental.1
Log:
Let's default to ARCH=powerpc even on 32bit powerpc.


Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Nov 24 18:31:34 2005
@@ -3,13 +3,16 @@
   [ Frederik Schüler ]
   * New upstream release candidate.
   * Readdition of qla2xxx drivers, as firmware license has been fixed.
-  * Make CONFIG_PACKET, PACKET_MM and UNIX builtin on all architectures: 
+  * Make CONFIG_PACKET, PACKET_MM and UNIX builtin on all architectures:
     statically linked has better performance then modules due to TLB issue.
 
   [ Simon Horman ]
   * Enable MKISS globally (closes: #340215)
 
- -- Simon Horman <horms at debian.org>  Tue, 22 Nov 2005 10:46:21 +0900
+  [ Sven Luther ]
+  * [powerpc] Now use ARCH=powerpc for both 32bit and 64bit powerpc flavours.
+
+ -- Sven Luther <luther at debian.org>  Thu, 24 Nov 2005 18:27:24 +0000
 
 linux-2.6 (2.6.14-3) unstable; urgency=low
 

Added: dists/trunk/linux-2.6/debian/patches-debian/powerpc-arch-default-powerpc.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches-debian/powerpc-arch-default-powerpc.patch	Thu Nov 24 18:31:34 2005
@@ -0,0 +1,18 @@
+# 
+# Let's default to ARCH=powerpc, even in 32bit.
+# Author: David Woodhouse <david at woodhou.se>
+# Upstream status: upstream still uses ARCH=ppc on 32bit, but they have to
+# deal also with the embedded arches debian doesn't support.
+#
+
+--- linux-2.6.14/Makefile.orig	2005-11-19 17:13:52.000000000 +0000
++++ linux-2.6.14/Makefile	2005-11-19 17:14:04.000000000 +0000
+@@ -169,7 +169,7 @@ KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$
+ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
+ 				  -e s/arm.*/arm/ -e s/sa110/arm/ \
+ 				  -e s/s390x/s390/ -e s/parisc64/parisc/ \
+-				  -e s/ppc64/powerpc/ )
++				  -e s/ppc.*/powerpc/ )
+ 
+ # Cross compiling and selecting different set of gcc/bin-utils
+ # ---------------------------------------------------------------------------

Modified: dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc2-0experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc2-0experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches-debian/series/2.6.14+2.6.15-rc2-0experimental.1	Thu Nov 24 18:31:34 2005
@@ -27,3 +27,5 @@
 + m68k-spinlock.patch
 + sparc64-atyfb-xl-gr.patch
 #- alpha-compile-fix.patch
++ powerpc-arch-default-powerpc.patch
+