Peter,

Ok, here's the deal.  You need to make sure that you have either the
kernel-source RPM, or the kernel SRPM installed.  If you have the
kernel-source RPM, you should see the kernel source tree under
/usr/src/linux.  If it is the kernel SRPM, you will see a file named
kernel-2.4.spec (or something like that) in /usr/src/packages/SPECS.  If you
don't have the tree under /usr/src/linux, but you do have the spec file, cd
to the SPEC directory, and do an
"rpm -bp -f kernel-2.4.7.spec"  (or whatever your real spec file name is)
This will cause the kernel SRPM to be unloaded and all the source patches
applied under /usr/src/packages/BUILD/kernel-something.

Now, which ever case you're dealing with, cd to either /usr/src, or
/usr/src/packages/BUILD/kernel-something.  Then, issue this patch command:
patch -p0 < /tmp/UTSG-claw-2.4-patch

You should see it apply cleanly then.  (I hope.)

Mark Post

-----Original Message-----
From: Peter E. Abresch Jr. - at Pepco [mailto:[EMAIL PROTECTED]]
Sent: Wednesday, April 24, 2002 4:50 PM
To: [EMAIL PROTECTED]
Subject: Re: Linux CLAW Woes


ibm9672:/usr/src/packages/SOURCES # head /tmp/UTSG-claw-2.4-patch
diff -urN -X dontdiff linux/Documentation/s390/c7000.txt
NEWlinux/Documentation/s390/c7000.txt
--- linux/Documentation/s390/c7000.txt  Wed Dec 31 16:00:00 1969
+++ NEWlinux/Documentation/s390/c7000.txt       Wed Aug 22 13:50:17 2001
@@ -0,0 +1,92 @@
+Cisco 7000 (CLAW) support
+
+The c7000 module provides support for a channel attached Cisco 7xxx
+family router on Linux/390.  The parameters for the module are as
follows:
+
+       base0=0xYYYY    This parameter defines the base unit address of
the
ibm9672:/usr/src/packages/SOURCES #

from the patch command I get the following:

ibm9672:/usr/src/packages/SOURCES # patch -p1 < /tmp/UTSG-claw-2.4-patch
The next patch would create the file Documentation/s390/c7000.txt,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
Documentation/s390/c7000.txt.rej
can't find file to patch at input line 100
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -urN -X dontdiff linux/arch/s390/defconfig
NEWlinux/arch/s390/defconfig
|--- linux/arch/s390/defconfig  Wed Aug 22 15:03:27 2001
|+++ NEWlinux/arch/s390/defconfig       Wed Aug 22 13:52:12 2001
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 111
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -urN -X dontdiff linux/drivers/s390/Config.in
NEWlinux/drivers/s390/Config.in
|--- linux/drivers/s390/Config.in       Wed Aug 22 15:03:27 2001
|+++ NEWlinux/drivers/s390/Config.in    Wed Aug 22 13:53:57 2001
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 125
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -urN -X dontdiff linux/drivers/s390/net/Makefile
NEWlinux/drivers/s390/net/Makefile
|--- linux/drivers/s390/net/Makefile    Wed Aug 22 15:03:28 2001
|+++ NEWlinux/drivers/s390/net/Makefile Wed Aug 22 13:54:46 2001
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
The next patch would create the file drivers/s390/net/c7000.c,
which already exists!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file
drivers/s390/net/c7000.c.rej
ibm9672:/usr/src/packages/SOURCES #

Reply via email to