Re: Bug#221273: /usr/bin/make-kpkg: Patches not applied cleanly
On Mon, 17 Nov 2003 10:30:03 -0600
Manoj Srivastava <srivasta@debian.org> wrote:
>
> There is not much kernel-package can do about this. The best
> that can be done is to ensure that the unpatch script is called,
> which it is. Whether or not the patch applies again after unpatching
> depends on the patch and unpatch scripts of the patch package in
> particular.
>
> You provided no details about what patches were involved, now
> what errors occur, so I can't redirect this report.
>
Thanks for your reply. The patches were lowlatency and preempt with
2.4.22.
Testing whether "Low-latency patch for the Linux kernel" patch for 2.4.22
applies (dry run):
1 out of 1 hunk FAILED -- saving rejects to file arch/i386/config.in.rej
1 out of 1 hunk FAILED -- saving rejects to file drivers/char/mem.c.rej
1 out of 1 hunk FAILED -- saving rejects to file drivers/char/random.c.rej
1 out of 1 hunk FAILED -- saving rejects to file
drivers/i2c/i2c-algo-bit.c.rej
1 out of 3 hunks FAILED -- saving rejects to file
drivers/i2c/i2c-core.c.rej
2 out of 2 hunks FAILED -- saving rejects to file
drivers/video/fbcon-cfb16.c.rej
12 out of 14 hunks FAILED -- saving rejects to file fs/buffer.c.rej
3 out of 5 hunks FAILED -- saving rejects to file fs/dcache.c.rej
1 out of 1 hunk FAILED -- saving rejects to file fs/exec.c.rej
1 out of 1 hunk FAILED -- saving rejects to file fs/ext2/dir.c.rej
2 out of 2 hunks FAILED -- saving rejects to file fs/ext2/inode.c.rej
1 out of 1 hunk FAILED -- saving rejects to file fs/ext3/balloc.c.rej
2 out of 3 hunks FAILED -- saving rejects to file fs/ext3/inode.c.rej
1 out of 1 hunk FAILED -- saving rejects to file fs/ext3/namei.c.rej
3 out of 5 hunks FAILED -- saving rejects to file fs/inode.c.rej
2 out of 2 hunks FAILED -- saving rejects to file fs/jbd/checkpoint.c.rej
3 out of 5 hunks FAILED -- saving rejects to file fs/jbd/commit.c.rej
1 out of 1 hunk FAILED -- saving rejects to file fs/proc/array.c.rej
1 out of 1 hunk FAILED -- saving rejects to file fs/reiserfs/buffer2.c.rej
6 out of 7 hunks FAILED -- saving rejects to file
fs/reiserfs/journal.c.rej
3 out of 4 hunks FAILED -- saving rejects to file fs/reiserfs/stree.c.rej
Patch attempted to create file include/linux/low-latency.h, which already
exists.
1 out of 1 hunk FAILED -- saving rejects to file
include/linux/low-latency.h.rej
2 out of 2 hunks FAILED -- saving rejects to file include/linux/mm.h.rej
1 out of 1 hunk FAILED -- saving rejects to file
include/linux/reiserfs_fs.h.rej
1 out of 1 hunk FAILED -- saving rejects to file
include/linux/sysctl.h.rej
1 out of 1 hunk FAILED -- saving rejects to file kernel/exit.c.rej
1 out of 1 hunk FAILED -- saving rejects to file kernel/module.c.rej
2 out of 3 hunks FAILED -- saving rejects to file kernel/sched.c.rej
12 out of 17 hunks FAILED -- saving rejects to file mm/filemap.c.rej
6 out of 7 hunks FAILED -- saving rejects to file mm/memory.c.rej
3 out of 3 hunks FAILED -- saving rejects to file mm/mmap.c.rej
1 out of 1 hunk FAILED -- saving rejects to file mm/mremap.c.rej
2 out of 2 hunks FAILED -- saving rejects to file mm/slab.c.rej
2 out of 3 hunks FAILED -- saving rejects to file mm/swapfile.c.rej
6 out of 6 hunks FAILED -- saving rejects to file mm/vmscan.c.rej
1 out of 1 hunk FAILED -- saving rejects to file net/core/iovec.c.rej
3 out of 3 hunks FAILED -- saving rejects to file
net/ipv4/tcp_minisocks.c.rej
"Low-latency patch for the Linux kernel" patch for 2.4.22 does not apply
cleanly
Patch /usr/src/kernel-patches/all//apply/lowlatency failed.
and
Testing whether "Preemptible patch for the Linux kernel" patch for 2.4.22
applies (dry run):
1 out of 1 hunk FAILED -- saving rejects to file
arch/alpha/kernel/process.c.rej
2 out of 2 hunks FAILED -- saving rejects to file arch/i386/config.in.rej
1 out of 2 hunks FAILED -- saving rejects to file
arch/i386/kernel/cpuid.c.rej
5 out of 5 hunks FAILED -- saving rejects to file
arch/i386/kernel/entry.S.rej
1 out of 2 hunks FAILED -- saving rejects to file
arch/i386/kernel/i387.c.rej
2 out of 3 hunks FAILED -- saving rejects to file
arch/i386/kernel/ioport.c.rej
5 out of 5 hunks FAILED -- saving rejects to file
arch/i386/kernel/irq.c.rej
2 out of 2 hunks FAILED -- saving rejects to file
arch/i386/kernel/ldt.c.rej
1 out of 1 hunk FAILED -- saving rejects to file
arch/i386/kernel/microcode.c.rej
3 out of 3 hunks FAILED -- saving rejects to file
arch/i386/kernel/msr.c.rej
2 out of 2 hunks FAILED -- saving rejects to file
arch/i386/kernel/mtrr.c.rej
7 out of 7 hunks FAILED -- saving rejects to file
arch/i386/kernel/smp.c.rej
1 out of 1 hunk FAILED -- saving rejects to file
arch/i386/kernel/traps.c.rej
1 out of 1 hunk FAILED -- saving rejects to file
arch/i386/lib/dec_and_lock.c.rej
2 out of 2 hunks FAILED -- saving rejects to file arch/i386/mm/init.c.rej
1 out of 1 hunk FAILED -- saving rejects to file
arch/mips/config-shared.in.rej
1 out of 1 hunk FAILED -- saving rejects to file
arch/mips/kernel/i8259.c.rej
3 out of 4 hunks FAILED -- saving rejects to file
arch/mips/kernel/irq.c.rej
1 out of 1 hunk FAILED -- saving rejects to file
arch/mips/mm/extable.c.rej
1 out of 1 hunk FAILED -- saving rejects to file
arch/ppc/kernel/entry.S.rej
4 out of 6 hunks FAILED -- saving rejects to file
arch/ppc/kernel/irq.c.rej
1 out of 1 hunk FAILED -- saving rejects to file
arch/ppc/kernel/mk_defs.c.rej
1 out of 1 hunk FAILED -- saving rejects to file
arch/ppc/kernel/open_pic.c.rej
2 out of 3 hunks FAILED -- saving rejects to file
arch/ppc/kernel/temp.c.rej
1 out of 1 hunk FAILED -- saving rejects to file
arch/ppc/lib/dec_and_lock.c.rej
2 out of 2 hunks FAILED -- saving rejects to file arch/ppc/mm/init.c.rej
7 out of 7 hunks FAILED -- saving rejects to file arch/ppc/mm/tlb.c.rej
1 out of 1 hunk FAILED -- saving rejects to file CREDITS.rej
Patch attempted to create file Documentation/preempt-locking.txt, which
already exists.
1 out of 1 hunk FAILED -- saving rejects to file
Documentation/preempt-locking.txt.rej
1 out of 1 hunk FAILED -- saving rejects to file
drivers/ieee1394/csr.c.rej
1 out of 1 hunk FAILED -- saving rejects to file
drivers/sound/sound_core.c.rej
1 out of 1 hunk FAILED -- saving rejects to file fs/adfs/map.c.rej
1 out of 1 hunk FAILED -- saving rejects to file fs/exec.c.rej
1 out of 1 hunk FAILED -- saving rejects to file fs/fat/cache.c.rej
1 out of 1 hunk FAILED -- saving rejects to file fs/nfsd/nfssvc.c.rej
1 out of 1 hunk FAILED -- saving rejects to file fs/nls/nls_base.c.rej
1 out of 1 hunk FAILED -- saving rejects to file
include/asm-i386/desc.h.rej
1 out of 2 hunks FAILED -- saving rejects to file
include/asm-i386/hardirq.h.rej
3 out of 3 hunks FAILED -- saving rejects to file
include/asm-i386/highmem.h.rej
1 out of 2 hunks FAILED -- saving rejects to file
include/asm-i386/hw_irq.h.rej
2 out of 2 hunks FAILED -- saving rejects to file
include/asm-i386/i387.h.rej
2 out of 2 hunks FAILED -- saving rejects to file
include/asm-i386/pgalloc.h.rej
2 out of 3 hunks FAILED -- saving rejects to file
include/asm-i386/smplock.h.rej
2 out of 3 hunks FAILED -- saving rejects to file
include/asm-i386/softirq.h.rej
7 out of 7 hunks FAILED -- saving rejects to file
include/asm-i386/spinlock.h.rej
2 out of 2 hunks FAILED -- saving rejects to file
include/asm-mips/smplock.h.rej
3 out of 3 hunks FAILED -- saving rejects to file
include/asm-mips/softirq.h.rej
1 out of 1 hunk FAILED -- saving rejects to file include/asm-ppc/dma.h.rej
2 out of 2 hunks FAILED -- saving rejects to file
include/asm-ppc/hardirq.h.rej
3 out of 3 hunks FAILED -- saving rejects to file
include/asm-ppc/highmem.h.rej
1 out of 1 hunk FAILED -- saving rejects to file
include/asm-ppc/mmu_context.h.rej
2 out of 2 hunks FAILED -- saving rejects to file
include/asm-ppc/pgalloc.h.rej
2 out of 2 hunks FAILED -- saving rejects to file
include/asm-ppc/smplock.h.rej
3 out of 3 hunks FAILED -- saving rejects to file
include/asm-ppc/softirq.h.rej
1 out of 1 hunk FAILED -- saving rejects to file
include/linux/brlock.h.rej
2 out of 2 hunks FAILED -- saving rejects to file
include/linux/dcache.h.rej
1 out of 2 hunks FAILED -- saving rejects to file
include/linux/fs_struct.h.rej
2 out of 2 hunks FAILED -- saving rejects to file
include/linux/highmem.h.rej
4 out of 5 hunks FAILED -- saving rejects to file
include/linux/sched.h.rej
1 out of 1 hunk FAILED -- saving rejects to file
include/linux/smp_lock.h.rej
4 out of 4 hunks FAILED -- saving rejects to file
include/linux/spinlock.h.rej
1 out of 2 hunks FAILED -- saving rejects to file
include/linux/tqueue.h.rej
2 out of 3 hunks FAILED -- saving rejects to file kernel/exit.c.rej
1 out of 1 hunk FAILED -- saving rejects to file kernel/fork.c.rej
1 out of 1 hunk FAILED -- saving rejects to file kernel/ksyms.c.rej
8 out of 8 hunks FAILED -- saving rejects to file kernel/sched.c.rej
4 out of 5 hunks FAILED -- saving rejects to file kernel/softirq.c.rej
2 out of 2 hunks FAILED -- saving rejects to file kernel/sys.c.rej
1 out of 1 hunk FAILED -- saving rejects to file lib/dec_and_lock.c.rej
2 out of 2 hunks FAILED -- saving rejects to file mm/slab.c.rej
3 out of 3 hunks FAILED -- saving rejects to file net/core/dev.c.rej
1 out of 1 hunk FAILED -- saving rejects to file net/core/skbuff.c.rej
1 out of 1 hunk FAILED -- saving rejects to file net/socket.c.rej
1 out of 1 hunk FAILED -- saving rejects to file
net/sunrpc/pmap_clnt.c.rej
"Preemptible patch for the Linux kernel" patch for 2.4.22 does not apply
cleanly
Patch /usr/src/kernel-patches/all//apply/preempt failed.
Hit return to Continue
HTH
-Richard.
Reply to: