[kernel] r5457 -
dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches
Martin Michlmayr
tbm at costa.debian.org
Mon Jan 16 17:43:09 UTC 2006
Author: tbm
Date: Mon Jan 16 17:43:08 2006
New Revision: 5457
Modified:
dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/10_arch-makefile.dpatch
dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/11_byteorder-proc.dpatch
dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/36_sb1-addrspace.dpatch
dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/52_ip22-sercon.dpatch
dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/54_ip32-eth0.dpatch
Log:
convert all patches to use -p1
Modified: dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/10_arch-makefile.dpatch
==============================================================================
--- dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/10_arch-makefile.dpatch (original)
+++ dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/10_arch-makefile.dpatch Mon Jan 16 17:43:08 2006
@@ -13,8 +13,8 @@
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
case "$1" in
- -patch) patch -p0 ${patch_opts} < $0;;
- -unpatch) patch -R -p0 ${patch_opts} < $0;;
+ -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;;
@@ -27,8 +27,8 @@
RCS file: /home/cvs/linux/arch/mips/Makefile,v
retrieving revision 1.186
diff -u -p -r1.186 Makefile
---- arch/mips/Makefile 18 Dec 2004 01:15:52 -0000 1.186
-+++ arch/mips/Makefile 10 Jan 2005 22:10:32 -0000
+--- a/arch/mips/Makefile 18 Dec 2004 01:15:52 -0000 1.186
++++ b/arch/mips/Makefile 10 Jan 2005 22:10:32 -0000
@@ -118,7 +118,7 @@ if $(CC) $$gcc_abi -S -o /dev/null -xc /
else \
gcc_abi=; gcc_isa=-$(5); \
Modified: dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/11_byteorder-proc.dpatch
==============================================================================
--- dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/11_byteorder-proc.dpatch (original)
+++ dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/11_byteorder-proc.dpatch Mon Jan 16 17:43:08 2006
@@ -13,8 +13,8 @@
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
case "$1" in
- -patch) patch -p0 ${patch_opts} < $0;;
- -unpatch) patch -R -p0 ${patch_opts} < $0;;
+ -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;;
@@ -27,8 +27,8 @@
RCS file: /home/cvs/linux/arch/mips/kernel/proc.c,v
retrieving revision 1.27.2.17
diff -u -p -u -r1.27.2.17 proc.c
---- arch/mips/kernel/proc.c 27 Apr 2003 23:34:46 -0000 1.27.2.17
-+++ arch/mips/kernel/proc.c 21 Sep 2003 00:14:13 -0000
+--- a/arch/mips/kernel/proc.c 27 Apr 2003 23:34:46 -0000 1.27.2.17
++++ b/arch/mips/kernel/proc.c 21 Sep 2003 00:14:13 -0000
@@ -100,6 +100,11 @@ static int show_cpuinfo(struct seq_file
seq_printf(m, "BogoMIPS\t\t: %lu.%02lu\n",
cpu_data[n].udelay_val / (500000/HZ),
Modified: dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/36_sb1-addrspace.dpatch
==============================================================================
--- dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/36_sb1-addrspace.dpatch (original)
+++ dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/36_sb1-addrspace.dpatch Mon Jan 16 17:43:08 2006
@@ -13,8 +13,8 @@
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
case "$1" in
- -patch) patch -p0 ${patch_opts} < $0;;
- -unpatch) patch -R -p0 ${patch_opts} < $0;;
+ -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;;
@@ -32,8 +32,8 @@
RCS file: /home/cvs/linux/include/asm-mips/addrspace.h,v
retrieving revision 1.18
diff -u -p -r1.18 addrspace.h
---- include/asm-mips/addrspace.h 14 Jul 2005 12:05:08 -0000 1.18
-+++ include/asm-mips/addrspace.h 15 Sep 2005 21:46:56 -0000
+--- a/include/asm-mips/addrspace.h 14 Jul 2005 12:05:08 -0000 1.18
++++ b/include/asm-mips/addrspace.h 15 Sep 2005 21:46:56 -0000
@@ -131,6 +131,8 @@
|| defined (CONFIG_CPU_R5000) \
|| defined (CONFIG_CPU_NEVADA) \
Modified: dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/52_ip22-sercon.dpatch
==============================================================================
--- dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/52_ip22-sercon.dpatch (original)
+++ dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/52_ip22-sercon.dpatch Mon Jan 16 17:43:08 2006
@@ -19,8 +19,8 @@
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
case "$1" in
- -patch) patch -p0 ${patch_opts} < $0;;
- -unpatch) patch -R -p0 ${patch_opts} < $0;;
+ -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;;
@@ -28,8 +28,8 @@
exit 0
---- arch/mips/sgi-ip22/ip22-setup.c.orig 2005-02-17 01:53:53.000000000 +0100
-+++ arch/mips/sgi-ip22/ip22-setup.c 2005-02-17 10:32:35.000000000 +0100
+--- a/arch/mips/sgi-ip22/ip22-setup.c.orig 2005-02-17 01:53:53.000000000 +0100
++++ b/arch/mips/sgi-ip22/ip22-setup.c 2005-02-17 10:32:35.000000000 +0100
@@ -56,6 +56,7 @@ extern void ip22_time_init(void) __init;
static int __init ip22_setup(void)
{
Modified: dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/54_ip32-eth0.dpatch
==============================================================================
--- dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/54_ip32-eth0.dpatch (original)
+++ dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/54_ip32-eth0.dpatch Mon Jan 16 17:43:08 2006
@@ -13,8 +13,8 @@
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
case "$1" in
- -patch) patch -p0 ${patch_opts} < $0;;
- -unpatch) patch -R -p0 ${patch_opts} < $0;;
+ -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;;
@@ -27,8 +27,8 @@
RCS file: /home/cvs/linux/drivers/net/Makefile,v
retrieving revision 1.107
diff -u -r1.107 Makefile
---- drivers/net/Makefile 15 Nov 2004 11:49:28 -0000 1.107
-+++ drivers/net/Makefile 12 Jan 2005 19:58:47 -0000
+--- a/drivers/net/Makefile 15 Nov 2004 11:49:28 -0000 1.107
++++ b/drivers/net/Makefile 12 Jan 2005 19:58:47 -0000
@@ -28,6 +28,8 @@
obj-$(CONFIG_MYRI_SBUS) += myri_sbus.o
obj-$(CONFIG_SUNGEM) += sungem.o sungem_phy.o
More information about the Kernel-svn-changes
mailing list