[#4172] build xenomai fails for patch rejection on branch again.

Document created by Aaronwu Employee on Aug 29, 2013
Version 1Show Document
  • View in full screen mode

[#4172] build xenomai fails for patch rejection on branch again.

Submitted By: Mingquan Pan

Open Date

2008-06-17 05:03:51     Close Date

2008-06-27 05:17:37

Priority:

Medium High     Assignee:

Yi Li

Status:

Closed     Fixed In Release:

N/A

Found In Release:

N/A     Release:

Category:

N/A     Board:

N/A

Processor:

N/A     Silicon Revision:

Is this bug repeatable?:

Yes     Resolution:

Out of Date

Uboot version or rev.:

    Toolchain version or rev.:

08r1-8

App binary format:

N/A     

Summary: build xenomai fails for patch rejection on branch again.

Details:

 

build xenomai fails for patch rejection on branch again.

 

make[3]: Entering directory `/home/test/work/cruise/checkouts/uclinux-dist/user/busybox'

make[3]: warning: -jN forced in submake: disabling jobserver mode.

patching file arch/blackfin/Kconfig

Hunk #1 succeeded at 289 (offset 19 lines).

patching file arch/blackfin/kernel/bfin_gpio.c

patching file arch/blackfin/kernel/entry.S

Hunk #1 succeeded at 42 (offset 1 line).

patching file arch/blackfin/kernel/ipipe.c

  SPLIT   include/autoconf.h -> include/config/*

patching file arch/blackfin/kernel/irqchip.c

Hunk #1 succeeded at 128 (offset 9 lines).

Hunk #2 succeeded at 138 (offset 9 lines).

patching file arch/blackfin/kernel/Makefile

patching file arch/blackfin/kernel/mcount.S

patching file arch/blackfin/kernel/process.c

Hunk #1 succeeded at 79 (offset 4 lines).

patching file arch/blackfin/kernel/time.c

Hunk #1 succeeded at 33 with fuzz 1.

Hunk #2 succeeded at 68 with fuzz 2 (offset 15 lines).

Hunk #3 FAILED at 113.

Hunk #4 succeeded at 136 (offset 21 lines).

1 out of 4 hunks FAILED -- saving rejects to file arch/blackfin/kernel/time.c.rej

patching file arch/blackfin/kernel/traps.c

Hunk #1 succeeded at 506 (offset 1 line).

patching file arch/blackfin/lib/ins.S

patching file arch/blackfin/mach-bf527/Kconfig

patching file arch/blackfin/mach-bf533/Kconfig

patching file arch/blackfin/mach-bf537/Kconfig

patching file arch/blackfin/mach-bf548/Kconfig

patching file arch/blackfin/mach-bf561/Kconfig

Hunk #1 succeeded at 142 (offset 4 lines).

patching file arch/blackfin/mach-common/entry.S

Hunk #1 succeeded at 512 (offset 36 lines).

Hunk #2 succeeded at 608 (offset 36 lines).

Hunk #3 succeeded at 698 (offset 36 lines).

patching file arch/blackfin/mach-common/interrupt.S

  GEN     include/bbconfigopts.h

Hunk #1 succeeded at 152 (offset 23 lines).

Hunk #2 succeeded at 266 (offset 23 lines).

patching file arch/blackfin/mach-common/ints-priority.c

patching file drivers/pci/htirq.c

patching file drivers/serial/bfin_5xx.c

patching file include/asm-blackfin/atomic.h

Hunk #1 FAILED at 25.

Hunk #2 succeeded at 113 (offset 68 lines).

Hunk #3 succeeded at 127 (offset 67 lines).

Hunk #4 succeeded at 139 with fuzz 1 (offset 67 lines).

Hunk #5 FAILED at 161.

2 out of 5 hunks FAILED -- saving rejects to file include/asm-blackfin/atomic.h.rej

patching file include/asm-blackfin/bitops.h

Hunk #1 succeeded at 84 with fuzz 1 (offset 60 lines).

Hunk #2 FAILED at 112.

Hunk #3 succeeded at 108 with fuzz 1 (offset 34 lines).

Hunk #4 FAILED at 123.

Hunk #5 succeeded at 121 (offset 24 lines).

Hunk #6 succeeded at 137 (offset 12 lines).

2 out of 7 hunks FAILED -- saving rejects to file include/asm-blackfin/bitops.h.rej

patching file include/asm-blackfin/entry.h

patching file include/asm-blackfin/ipipe_base.h

patching file include/asm-blackfin/ipipe.h

patching file include/asm-blackfin/mach-bf527/cdefBF52x_base.h

patching file include/asm-blackfin/mach-bf527/irq.h

patching file include/asm-blackfin/mach-bf533/cdefBF532.h

patching file include/asm-blackfin/mach-bf537/cdefBF534.h

patching file include/asm-blackfin/mach-bf548/cdefBF54x_base.h

patching file include/asm-blackfin/mach-bf548/irq.h

patching file include/asm-blackfin/mach-bf561/cdefBF561.h

patching file include/asm-blackfin/system.h

Hunk #1 succeeded at 51 with fuzz 2 (offset 7 lines).

Hunk #2 succeeded at 217 (offset 7 lines).

Hunk #3 succeeded at 226 (offset 7 lines).

Hunk #4 succeeded at 266 with fuzz 2 (offset 11 lines).

Hunk #5 succeeded at 387 (offset 69 lines).

Hunk #6 succeeded at 409 (offset 69 lines).

Hunk #7 succeeded at 424 (offset 69 lines).

Hunk #8 succeeded at 455 (offset 69 lines).

patching file include/linux/clockchips.h

patching file include/linux/hardirq.h

patching file include/linux/ipipe_base.h

patching file include/linux/ipipe_compat.h

patching file include/linux/ipipe.h

patching file include/linux/ipipe_percpu.h

patching file include/linux/ipipe_tickdev.h

patching file include/linux/ipipe_trace.h

patching file include/linux/irq.h

patching file include/linux/kernel.h

patching file include/linux/linkage.h

patching file include/linux/mm.h

patching file include/linux/preempt.h

patching file include/linux/sched.h

patching file include/linux/spinlock.h

patching file include/linux/spinlock_types.h

patching file init/Kconfig

patching file init/main.c

patching file kernel/exit.c

patching file kernel/fork.c

patching file kernel/ipipe/core.c

patching file kernel/ipipe/Kconfig

patching file kernel/ipipe/Kconfig.debug

patching file kernel/ipipe/Makefile

patching file kernel/ipipe/tracer.c

patching file kernel/irq/chip.c

patching file kernel/irq/manage.c

patching file kernel/Makefile

patching file kernel/power/swsusp.c

patching file kernel/printk.c

patching file kernel/sched.c

patching file kernel/signal.c

patching file kernel/spinlock.c

patching file kernel/time/clockevents.c

patching file lib/bust_spinlocks.c

patching file lib/ioremap.c

patching file lib/Kconfig.debug

patching file lib/smp_processor_id.c

patching file lib/spinlock_debug.c

patching file Makefile

patching file mm/memory.c

patching file mm/mlock.c

patching file mm/vmalloc.c

prepare-kernel.sh: Unable to patch kernel 2.6.22.19 with adeos-bfin.patch.

make[3]: *** [xeno_patch] Error 2

make[3]: Leaving directory `/home/test/work/cruise/checkouts/uclinux-dist/user/xenomai'

make[2]: *** [xenomai] Error 2

make[2]: *** Waiting for unfinished jobs....

make[3]: Leaving directory `/home/test/work/cruise/checkouts/uclinux-dist/user/busybox'

make[2]: Leaving directory `/home/test/work/cruise/checkouts/uclinux-dist/user'

make[1]: *** [all] Error 2

make[1]: Leaving directory `/home/test/work/cruise/checkouts/uclinux-dist/user'

make: *** [subdirs] Error 1

 

 

Follow-ups

 

--- Yi Li                                                    2008-06-26 00:40:56

The patch can be applied successfully now, with bellow revision.

 

root:/> version

kernel:    Linux release 2.6.22.19-ADI-2008R1-svn4896, build #9 Thu Jun 26

12:49:53 CST 2008

toolchain: bfin-linux-uclibc-gcc release gcc version 4.1.2 (ADI svn)

user-dist: release svn-6817, build #251 Thu Jun 26 12:48:49 CST 2008

 

--- Mingquan Pan                                             2008-06-27 06:17:38

Yeah, it can build on branch.Close.

 

 

 

    Files

    Changes

    Commits

    Dependencies

    Duplicates

    Associations

    Tags

 

File Name     File Type     File Size     Posted By

No Files Were Found

Attachments

    Outcomes