kernel patching problem

[philippjosefric]

Hallo fedora-forum
In order to make an ABI-Patch on linux-2.6.10 I found the following patches
linux-abi-2[1][1].6.10-rc1.diff.bz2
linux-abi-2.6.10-rc2.diff.bz2
linux-abi-2.6.10-rc2-xout.diff
linux-2.6.10-rc3-abi.diff.bz2
linux-2.6.10-rc3-abi-xout.incremental-diff.bz2

Is it correct to do the patch
patch -p1 <../linux-abi-2[1][1].6.10-rc1.diff on linux-2.6.10
(This brougt me the ERROR, which I show at the bottom under "ERROR-Mesage")

Or would I have to patch first with
patch-2.6.10-rc1 over linux-2.6.10
and patch-2.6.10-rc2
and patch-2.6.10-rc3

And then the wanted ABI-patches rc1 - rc3

Or do I have to patch first rc1 and abi-rc1, then rc2 and abi-rc2 and so on?
and finally linux-2.6.10-rc3-abi-xout.incremental-diff

Or can I do the 3 patches rc1-rc3 over linux.2.6.10 and then
once abi-rc3 over the rc1-3 patched linux-2.6.10 version?

What does this "rc" mean?

After compiling the kernel linux-2.6.10 I patched
patch -p1 <../linux-abi-2[1][1].6.10-rc1.diff and got the problem:

ERROR-message:
***************
*** 7,13 ****
sysctl.o capability.o ptrace.o timer.o user.o \
signal.o sys.o kmod.o workqueue.o pid.o \
rcupdate.o intermodule.o extable.o params.o posix-timers.o \
- kthread.o wait.o kfifo.o

obj-$(CONFIG_FUTEX) += futex.o
obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o
--- 7,13 ----
sysctl.o capability.o ptrace.o timer.o user.o \
signal.o sys.o kmod.o workqueue.o pid.o \
rcupdate.o intermodule.o extable.o params.o posix-timers.o \
+ kthread.o wait.o kfifo.o syscall_ksyms.o

obj-$(CONFIG_FUTEX) += futex.o
obj-$(CONFIG_GENERIC_ISA_DMA) += dma.o


What did I wrong?

Thanks for help
Philipp

[james_in_denver]

Without seeing the actual patch files, I am guessing you have to do this:

Or would I have to patch first with
patch-2.6.10-rc1 over linux-2.6.10
and patch-2.6.10-rc2
and patch-2.6.10-rc3

"rc" typically means "Release Candidate" (though it's also a brand name of a diet drink here in the U.S.??)

It looks like the patch applied normally. It appears from your example that it is patching a "Makefile" in some directory in the kernel source tree. (again, without having the file in front of me, I can't tell which one).

You can edit the "patchfile" and see what it's "patching", then look at at the file you are telling it to patch, and see if the "new"/"changed" section is there. (Hint: the "*** 7,13 ****" is telling you what line numbers in the file are being targeted for change).

[philippjosefric]

thanks for the answer ...
Here the first lines of patch-2.6.10-rc1.diff

diff -Nru a/CREDITS b/CREDITS
--- a/CREDITS 2004-10-22 14:41:37 -07:00
+++ b/CREDITS 2004-10-22 14:41:37 -07:00
@@ -2764,7 +2764,7 @@
E: luca.risolia@studio.unibo.it
P: 1024D/FCE635A4 88E8 F32F 7244 68BA 3958 5D40 99DA 5D2A FCE6 35A4
D: V4L driver for W996[87]CF JPEG USB Dual Mode Camera Chips
-D: V4L2 driver for SN9C10[12] PC Camera Controllers
+D: V4L2 driver for SN9C10x PC Camera Controllers
S: Via Liberta' 41/A
S: Osio Sotto, 24046, Bergamo
S: Italy
diff -Nru a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
--- a/Documentation/DocBook/Makefile 2004-10-22 14:41:20 -07:00
+++ b/Documentation/DocBook/Makefile 2004-10-22 14:41:20 -07:00
@@ -11,7 +11,7 @@
mousedrivers.sgml deviceiobook.sgml procfs-guide.sgml \
tulip-user.sgml writing_usb_driver.sgml scsidrivers.sgml \
sis900.sgml kernel-api.sgml journal-api.sgml lsm.sgml usb.sgml \ - gadget.sgml libata.sgml
+ gadget.sgml libata.sgml mtdnand.sgml librs.sgml

###
So I have to do the patches all at once.
Is it OK, when I do like this
# patch -p1 <../patch-2.6.10-rc1
# patch -p2 <../patch-2.6.10-rc2
# patch -p3 <../patch-2.6.10-rc3
# patch -p4 ... and so on
then
#make
#make modules_install
#make install

OR

do I have to complete the whole compilation for every patch?

It is rather timeconsuming to try and error, thereor I better ask the specialists :-)

Tanks
Philipp

[philippjosefric]

uf, this does not work:
with linux.2.6.10:
1. make
2. patch -p1 <../patch-2.6.10-rc1

patching file CREDITS
Reversed (or previously applied) patch detected! Assume -R? [n] y
Hunk #1 succeeded at 2770 (offset 6 lines).
patching file Documentation/DocBook/Makefile
Hunk #1 FAILED at 11.
1 out of 1 hunk FAILED -- saving rejects to file Documentation/DocBook/Makefile.rej

Documentation/DocBook/Makefile.re:
*************** *** 11,17 ****
mousedrivers.sgml deviceiobook.sgml procfs-guide.sgml \
tulip-user.sgml writing_usb_driver.sgml scsidrivers.sgml \
sis900.sgml kernel-api.sgml journal-api.sgml lsm.sgml usb.sgml \
- gadget.sgml libata.sgml

### # The build process is as follows (targets):
--- 11,17 ----
mousedrivers.sgml deviceiobook.sgml procfs-guide.sgml \
tulip-user.sgml writing_usb_driver.sgml scsidrivers.sgml \
sis900.sgml kernel-api.sgml journal-api.sgml lsm.sgml usb.sgml \
+ gadget.sgml libata.sgml mtdnand.sgml librs.sgml

###
# The build process is as follows (targets):

There seems something to be wrong.
Who can help me?
Philipp