← Back to team overview

sslug-teknik team mailing list archive

kerne 2.2.13 - prepatch-2.2.14-pre1 og pre2..

 


Hej alle,

jeg sidder her og prøver at patche den nyeste kerne med Alan's prepatches..
da de tilsyneladende fikser nogle
ting mht. masquarading.. (vigtigt for mig)..

machine:/usr/src/linux/gunzip < ../pre-patch-2.2.14pre1.gz | patch -p1 --
går fint, men

når jeg efterfølgende patcher pre2..

machine:/usr/src/linux/gunzip < ../pre-patch-2.2.14pre1.gz | patch -p1

så kommer nedenstående.. (her har jeg prøvet at sige patch anyway..

patching file `CREDITS'
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n] y
Hunk #1 FAILED at 789.
1 out of 2 hunks FAILED -- saving rejects to CREDITS.rej
patching file `Documentation/Changes'
Reversed (or previously applied) patch detected!  Assume -R? [n] y
patching file `Documentation/Configure.help'
Reversed (or previously applied) patch detected!  Assume -R? [n] y
patching file `Documentation/kernel-docs.txt'
patching file `Documentation/kernel-parameters.txt'
Reversed (or previously applied) patch detected!  Assume -R? [n] y
patching file `Makefile'
Reversed (or previously applied) patch detected!  Assume -R? [n] y
patching file `arch/alpha/kernel/process.c'
Reversed (or previously applied) patch detected!  Assume -R? [n] y
patching file `arch/alpha/kernel/proto.h'
Reversed (or previously applied) patch detected!  Assume -R? [n] y
patching file `arch/alpha/kernel/ptrace.c'
patching file `arch/alpha/kernel/signal.c'
patching file `arch/alpha/math-emu/fp-emul.c'
Reversed (or previously applied) patch detected!  Assume -R? [n] y
patching file `arch/alpha/math-emu/sfp-machine.h'
Reversed (or previously applied) patch detected!  Assume -R? [n] y
patching file `arch/alpha/mm/fault.c'
patching file `arch/i386/boot/compressed/Makefile'
Reversed (or previously applied) patch detected!  Assume -R? [n] y
patching file `arch/i386/boot/compressed/misc.c'
Reversed (or previously applied) patch detected!  Assume -R? [n] y
patching file `arch/i386/kernel/bios32.c'
Hunk #1 succeeded at 1095 with fuzz 2.
patching file `arch/i386/kernel/io_apic.c'
Reversed (or previously applied) patch detected!  Assume -R? [n] y
patching file `arch/i386/kernel/irq.h'
Reversed (or previously applied) patch detected!  Assume -R? [n] y
patching file `arch/i386/kernel/ptrace.c'
patching file `arch/i386/kernel/setup.c'
Hunk #2 FAILED at 369.
Hunk #3 FAILED at 758.
Hunk #5 FAILED at 1023.
3 out of 5 hunks FAILED -- saving rejects to arch/i386/kernel/setup.c.rej
patching file `arch/i386/kernel/signal.c'

nogle ideer ? gode råd ? erfaringer med Alan's prepatch's.. ?

/Klavs




Follow ups