r4496 - in dists/trunk/linux-2.6-2.6.14-rc4/debian/patches-debian: . series

[Sven Luther]

Author: luther
Date: 2005-10-16 23:07:21 +0000 (Sun, 16 Oct 2005)
New Revision: 4496

Removed:
   dists/trunk/linux-2.6-2.6.14-rc4/debian/patches-debian/powerpc-fix-power3-ftbfs.patch
   dists/trunk/linux-2.6-2.6.14-rc4/debian/patches-debian/powerpc-pmac-cache-power34-fix.patch
Modified:
   dists/trunk/linux-2.6-2.6.14-rc4/debian/patches-debian/series/2.6.13+2.6.14-rc4-1
Log:
Dropped those two patches, as they will not be upstream, we don't build 32bit kernels for ppc64 cpus anymore, and upstream will drop support for them anyway.


Deleted: dists/trunk/linux-2.6-2.6.14-rc4/debian/patches-debian/powerpc-fix-power3-ftbfs.patch
===================================================================
--- dists/trunk/linux-2.6-2.6.14-rc4/debian/patches-debian/powerpc-fix-power3-ftbfs.patch	2005-10-16 22:39:34 UTC (rev 4495)
+++ dists/trunk/linux-2.6-2.6.14-rc4/debian/patches-debian/powerpc-fix-power3-ftbfs.patch	2005-10-16 23:07:21 UTC (rev 4496)
@@ -1,27 +0,0 @@
-#! /bin/sh -e 
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: Works around a broken build system, namely the
-## DP: Description: simple bootloader on power 3/4.
-## DP: Misc: Pulled from the ubuntu tree.
-## DP: Patch author: fabbione at ubuntu.com
-## DP: Upstream status: FTBFS fix, guess it will be fixed upstream too
-
-. $(dirname $0)/DPATCH
-
- at DPATCH@
-diff -urNad linux-source-2.6.10-2.6.10/arch/ppc/boot/simple/misc-prep.c /usr/src/dpatchtemp/dpep.cQRwcC/linux-source-2.6.10-2.6.10/arch/ppc/boot/simple/misc-prep.c
---- linux-source-2.6.10-2.6.10/arch/ppc/boot/simple/misc-prep.c	2004-12-24 22:33:51.000000000 +0100
-+++ /usr/src/dpatchtemp/dpep.cQRwcC/linux-source-2.6.10-2.6.10/arch/ppc/boot/simple/misc-prep.c	2004-12-28 10:43:29.838010536 +0100
-@@ -152,9 +152,11 @@
- 		hold_residual->VitalProductData.Reserved5 = 0xdeadbeef;
- 	}
- 
-+#if defined(CONFIG_6xx)
- 	/* Now go and clear out the BATs and ensure that our MSR is
- 	 * correct .*/
- 	disable_6xx_mmu();
-+#endif
- 
- 	/* Make r3 be a pointer to the residual data. */
- 	return (unsigned long)hold_residual;

Deleted: dists/trunk/linux-2.6-2.6.14-rc4/debian/patches-debian/powerpc-pmac-cache-power34-fix.patch
===================================================================
--- dists/trunk/linux-2.6-2.6.14-rc4/debian/patches-debian/powerpc-pmac-cache-power34-fix.patch	2005-10-16 22:39:34 UTC (rev 4495)
+++ dists/trunk/linux-2.6-2.6.14-rc4/debian/patches-debian/powerpc-pmac-cache-power34-fix.patch	2005-10-16 23:07:21 UTC (rev 4496)
@@ -1,30 +0,0 @@
-#! /bin/sh -e
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: [PATCH] ppc32: fixes FTBFS on power3/4.
-## DP: This patch doesn't build pmac_cache.S on power3/power4, since it is
-## DP: broken there and not needed.
-## DP: Patch author: Sven Luther <luther at debian.org>
-## DP: Upstream status: FTBFS, submitted to linuxppc-dev and benh.
-
-. $(dirname $0)/DPATCH
-
- at DPATCH@
---- kernel-source-2.6.11/arch/ppc/platforms/Makefile.orig	2005-03-27 11:38:25.000000000 +0200
-+++ kernel-source-2.6.11/arch/ppc/platforms/Makefile	2005-03-27 11:39:23.000000000 +0200
-@@ -9,9 +9,15 @@
- ifeq ($(CONFIG_APUS),y)
- obj-$(CONFIG_PCI)		+= apus_pci.o
- endif
-+ifeq ($(CONFIG_6xx),y)
- obj-$(CONFIG_PPC_PMAC)		+= pmac_pic.o pmac_setup.o pmac_time.o \
- 					pmac_feature.o pmac_pci.o pmac_sleep.o \
- 					pmac_low_i2c.o pmac_cache.o
-+else
-+obj-$(CONFIG_PPC_PMAC)		+= pmac_pic.o pmac_setup.o pmac_time.o \
-+					pmac_feature.o pmac_pci.o pmac_sleep.o \
-+					pmac_low_i2c.o
-+endif
- obj-$(CONFIG_PPC_CHRP)		+= chrp_setup.o chrp_time.o chrp_pci.o \
- 					chrp_pegasos_eth.o
- obj-$(CONFIG_PPC_PREP)		+= prep_pci.o prep_setup.o

Modified: dists/trunk/linux-2.6-2.6.14-rc4/debian/patches-debian/series/2.6.13+2.6.14-rc4-1
===================================================================
--- dists/trunk/linux-2.6-2.6.14-rc4/debian/patches-debian/series/2.6.13+2.6.14-rc4-1	2005-10-16 22:39:34 UTC (rev 4495)
+++ dists/trunk/linux-2.6-2.6.14-rc4/debian/patches-debian/series/2.6.13+2.6.14-rc4-1	2005-10-16 23:07:21 UTC (rev 4496)
@@ -7,11 +7,9 @@
 + modular-ide.patch
 + modular-ide-pnp.patch
 + powerpc-calibrate-tau.patch
-+ powerpc-fix-power3-ftbfs.patch
 + powerpc-g3-750cxe.patch
 #+ powerpc-g4-l2-flush-errata.patch
 + powerpc-mkvmlinuz-support.patch
-+ powerpc-pmac-cache-power34-fix.patch
 + powerpc-serial.patch
 + qla2xxx-removed.patch
 #+ remove-references-to-removed-drivers.patch