Adam McKee wrote:
> It definitely patches. Maybe you're not using 'patch -p0' ?
>
> -- Adam
>
>
Adam,
Just to be on the safe side, here is what I am doing. I dumped it in a tiny script called do_patch and it writes the errors into
a Errofile
hope this helps
Ron Smits
mailto:rons@estic.com
--------------C26262EA6CA762A692585B6B
Content-Type: text/plain; charset=us-ascii; name="do_patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="do_patch"
cd /usr/src
echo Cleaning up Linux >/tmp/Errorfile
rm -r linux/*
echo Tarring the clean one >>/tmp/Errorfile
tar xzf /usr/local/saves/linux-2.0.30.tar.gz 2>>/tmp/Errorfile
echo PAtching to 31-7 >>/tmp/Errorfile
gunzip -c pre-patch-2.0.31-7.gz | patch -p0 -s 2>>/tmp/Errorfile
echo Patching in the QNX scheduler >>/tmp/Errorfile
cat /home/rons/QNX-scheduler-2.0.31-pre6-1.patch | patch -p0 >>/tmp/Errorfile 2>&1
--------------C26262EA6CA762A692585B6B
Content-Type: text/plain; charset=us-ascii; name="Errorfile"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="Errorfile"
Cleaning up Linux
Tarring the clean one
PAtching to 31-7
Patching in the QNX scheduler
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- linux/fs/proc/array.c.orig Sat Aug 16 12:26:48 1997
|+++ linux/fs/proc/array.c Sat Aug 16 12:26:58 1997
--------------------------
Patching file linux/fs/proc/array.c using Plan A...
Hunk #1 failed at 682.
1 out of 1 hunks failed--saving rejects to linux/fs/proc/array.c.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- linux/kernel/sys.c.orig Sat Aug 16 12:26:49 1997
|+++ linux/kernel/sys.c Sat Aug 16 12:26:58 1997
--------------------------
Patching file linux/kernel/sys.c using Plan A...
Hunk #1 failed at 67.
Hunk #2 failed at 98.
Hunk #3 failed at 114.
Hunk #4 failed at 122.
4 out of 4 hunks failed--saving rejects to linux/kernel/sys.c.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- linux/kernel/sched.c.orig Sat Aug 16 12:26:49 1997
|+++ linux/kernel/sched.c Sat Aug 16 12:26:58 1997
--------------------------
Patching file linux/kernel/sched.c using Plan A...
Hunk #1 failed at 7.
Hunk #2 failed at 93.
Hunk #3 failed at 109.
Hunk #4 failed at 182.
Hunk #5 failed at 201.
Hunk #6 failed at 308.
Hunk #7 failed at 423.
Hunk #8 failed at 432.
Hunk #9 failed at 459.
Hunk #10 failed at 476.
Hunk #11 failed at 522.
Hunk #12 failed at 1332.
Hunk #13 failed at 1368.
Hunk #14 failed at 1578.
Hunk #15 failed at 1598.
Hunk #16 failed at 1658.
Hunk #17 failed at 1671.
Hunk #18 failed at 1684.
Hunk #19 failed at 1752.
Hunk #20 failed at 1842.
Hunk #21 succeeded at 1853 with fuzz 2.
20 out of 21 hunks failed--saving rejects to linux/kernel/sched.c.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- linux/kernel/fork.c.orig Sat Aug 16 12:26:49 1997
|+++ linux/kernel/fork.c Sat Aug 16 12:36:40 1997
--------------------------
Patching file linux/kernel/fork.c using Plan A...
Hunk #1 failed at 217.
Hunk #2 failed at 265.
2 out of 2 hunks failed--saving rejects to linux/kernel/fork.c.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- linux/mm/vmscan.c.orig Sat Aug 16 12:26:49 1997
|+++ linux/mm/vmscan.c Sat Aug 16 12:26:58 1997
--------------------------
Patching file linux/mm/vmscan.c using Plan A...
Hunk #1 failed at 465.
1 out of 1 hunks failed--saving rejects to linux/mm/vmscan.c.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|--- linux/include/linux/sched.h.orig Sat Aug 16 12:26:49 1997
|+++ linux/include/linux/sched.h Sat Aug 16 12:26:58 1997
--------------------------
Patching file linux/include/linux/sched.h using Plan A...
Hunk #1 failed at 87.
Hunk #2 failed at 247.
Hunk #3 failed at 281.
Hunk #4 failed at 299.
Hunk #5 failed at 315.
5 out of 5 hunks failed--saving rejects to linux/include/linux/sched.h.rej
done
--------------C26262EA6CA762A692585B6B
Content-Type: text/x-vcard; charset=us-ascii; name="vcard.vcf"
Content-Transfer-Encoding: 7bit
Content-Description: Card for Ron Smits
Content-Disposition: attachment; filename="vcard.vcf"
begin: vcard
fn: Ron Smits
n: Smits;Ron
org: Estic Automatisering
email;internet: rons@estic.com
x-mozilla-cpt: ;0
x-mozilla-html: TRUE
end: vcard
--------------C26262EA6CA762A692585B6B--