[kernel] r5981 -
dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches
Martin Michlmayr
tbm at costa.debian.org
Mon Feb 27 21:19:52 UTC 2006
Author: tbm
Date: Mon Feb 27 21:19:51 2006
New Revision: 5981
Removed:
dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/00list
Modified:
dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/10_arch-makefile.dpatch (props changed)
dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/12_makefile.dpatch (contents, props changed)
dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/18_gettimeofday.dpatch (props changed)
dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/25_cobalt-network.dpatch (contents, props changed)
dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/27_cobalt-def_fix.dpatch (contents, props changed)
dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/28_cobalt_ide.dpatch (contents, props changed)
dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/29_cobalt_tulip2.dpatch (contents, props changed)
dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/32_sb1_probe_ide.dpatch (contents, props changed)
dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/52_fix_iomap_nonpci.dpatch (contents, props changed)
dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/65_fix_gcc4_opt.dpatch
Log:
get rid of dpatch stuff
Modified: dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/12_makefile.dpatch
==============================================================================
--- dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/12_makefile.dpatch (original)
+++ dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/12_makefile.dpatch Mon Feb 27 21:19:51 2006
@@ -10,24 +10,6 @@
#tree f771061d0c33cbae06f7e40721762efea0140332 tree
#parent 91b06e616c62c7aef213cafb1435e94158d18901 commit | commitdiff
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
--- linux-2.6.15/Makefile 2006-01-16 17:56:00.000000000 +0000
+++ new/Makefile 2006-01-16 17:57:29.000000000 +0000
@@ -169,7 +169,7 @@
Modified: dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/25_cobalt-network.dpatch
==============================================================================
--- dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/25_cobalt-network.dpatch (original)
+++ dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/25_cobalt-network.dpatch Mon Feb 27 21:19:51 2006
@@ -3,24 +3,6 @@
## DP: Basically got rejected as it by Jeff Garzik but needed for now.
## DP: Has been used by the HPPA folks for years
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
From: Jim Gifford <maillist at jg555.com>
I have been working on getting the RaQ2 to build using 64 bit. I ran
Modified: dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/27_cobalt-def_fix.dpatch
==============================================================================
--- dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/27_cobalt-def_fix.dpatch (original)
+++ dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/27_cobalt-def_fix.dpatch Mon Feb 27 21:19:51 2006
@@ -1,6 +1,3 @@
-#! /bin/sh -e
-## 27_cobalt-def_fix.dpatch by Martin Michlmayr <tbm at cyrius.com>
-
## DP: Initialize scache flushing functions when CPU has no scache
## DP: Patch author: Martin Michlmayr <tbm at cyrius.com>
## DP: Upstream status: submitted to linux-mips
@@ -19,28 +16,6 @@
# c-r4k.c | 16 +++++++++++-----
# 1 file changed, 11 insertions(+), 5 deletions(-)
-
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
-index 1b71d91..0668e9b 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -235,7 +235,9 @@ static inline void r4k_blast_scache_page
Modified: dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/28_cobalt_ide.dpatch
==============================================================================
--- dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/28_cobalt_ide.dpatch (original)
+++ dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/28_cobalt_ide.dpatch Mon Feb 27 21:19:51 2006
@@ -1,6 +1,3 @@
-#! /bin/sh -e
-## 28_cobalt_ide.dpatch by Peter Horton
-
## DP: Fix long IDE detection delay by not scanning non-existent channels.
## DP: Patch author: Peter Horton <pdh at colonel-panic.org>
## DP: Upstream status: submitted to linux-mips
@@ -12,27 +9,6 @@
# Signed-off-by: Peter Horton <pdh at colonel-panic.org>
# Acked-by: Alan Cox <alan at lxorguk.ukuu.org.uk>
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-Index: linux.git/include/asm-mips/mach-generic/ide.h
-===================================================================
--- linux.git.orig/include/asm-mips/mach-generic/ide.h 2006-01-24 22:07:36.000000000 +0000
+++ linux.git/include/asm-mips/mach-generic/ide.h 2006-01-24 23:41:19.000000000 +0000
@@ -30,7 +30,7 @@
Modified: dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/29_cobalt_tulip2.dpatch
==============================================================================
--- dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/29_cobalt_tulip2.dpatch (original)
+++ dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/29_cobalt_tulip2.dpatch Mon Feb 27 21:19:51 2006
@@ -10,29 +10,6 @@
extra PCI commands seems to reduce the chance of a hard lockup between the
Tulip and the PCI bridge.
-
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-
-Index: linux.git/drivers/net/tulip/tulip_core.c
-===================================================================
--- linux.git.orig/drivers/net/tulip/tulip_core.c 2006-01-29 21:43:40.000000000 +0000
+++ linux.git/drivers/net/tulip/tulip_core.c 2006-01-29 21:56:50.000000000 +0000
@@ -294,6 +294,8 @@
Modified: dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/32_sb1_probe_ide.dpatch
==============================================================================
--- dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/32_sb1_probe_ide.dpatch (original)
+++ dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/32_sb1_probe_ide.dpatch Mon Feb 27 21:19:51 2006
@@ -2,7 +2,6 @@
# DP: Patch author: Peter Horton <pdh at colonel-panic.org>
# DP: Upstream status: submitted to linux-ide
-
From: Peter Horton <pdh at colonel-panic.org>
[PATCH] Make sure we scan SWARM IDE interface for devices
@@ -10,13 +9,7 @@
Signed-off-by: Peter Horton <pdh at colonel-panic.org>
Signed-off-by: Martin Michlmayr <tbm at cyrius.com>
----
-
- swarm.c | 1 +
- 1 file changed, 1 insertion(+)
-Index: linux.git/drivers/ide/mips/swarm.c
-===================================================================
--- linux.git.orig/drivers/ide/mips/swarm.c 2006-01-23 22:48:58.000000000 +0000
+++ linux.git/drivers/ide/mips/swarm.c 2006-01-24 08:32:45.000000000 +0000
@@ -127,6 +127,7 @@
Modified: dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/52_fix_iomap_nonpci.dpatch
==============================================================================
--- dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/52_fix_iomap_nonpci.dpatch (original)
+++ dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/52_fix_iomap_nonpci.dpatch Mon Feb 27 21:19:51 2006
@@ -10,25 +10,6 @@
#
# Yes, R3000 does not define _CACHE_CACHABLE_COW.
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
--- a/arch/mips/lib/Makefile~ 2006-01-23 12:42:02.000000000 +0000
+++ b/arch/mips/lib/Makefile 2006-01-23 12:42:11.000000000 +0000
@@ -4,6 +4,6 @@
Modified: dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/65_fix_gcc4_opt.dpatch
==============================================================================
--- dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/65_fix_gcc4_opt.dpatch (original)
+++ dists/trunk/arch/mips/linux-patch-2.6.16-mips-2.6.16/debian/patches/65_fix_gcc4_opt.dpatch Mon Feb 27 21:19:51 2006
@@ -1,28 +1,7 @@
-#! /bin/sh -e
-## 65_fix_gcc4_opt.dpatch by Ralf Baechle <ralf at linux-mips.org>
-##
## DP: Fixes CONFIG_CC_OPTIMIZE_FOR_SIZE=y builds with GCC 4.0
+## DP: Patch author: Ralf Baechle <ralf at linux-mips.org>
## DP: Upstream status: suggested on linux-mips list, not in git yet
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-
> On Tuesday 17 January 2006 3:48 pm, Martin Michlmayr wrote:
> > Has anyone else seen the following error when compiling a kernel with GCC
> > 4.0 (GCC 3.3 works) and knows what to do about it?
More information about the Kernel-svn-changes
mailing list