[#4002] msh patch fails to apply to trunk

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

[#4002] msh patch fails to apply to trunk

Submitted By: Mingquan Pan

Open Date

2008-04-02 04:33:57     Close Date

2008-09-25 02:19:30

Priority:

Medium     Assignee:

Nobody

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: msh patch fails to apply to trunk

Details:

 

msh patch fails to apply to trunk.

 

Starting ./build_msh_kernel.exp

 

************** STEP 1: Decide the busybox version from Makefile.

 

^[[?1049h^[[?1h^[=^[[1;24r^[[?12;25h^[[?12l^[[?25h^[[?25l^[[24;1H"user/busybox/Makefile" ^M"user/busybox/Makefile" 33L, 928C^M^M^M

Entering Ex mode.  Type "visual" to go to Normal mode.^[[?12l^[[?25h^M^M^M

:/VER^M

^[[?25lsearch hit BOTTOM, continuing at TOP^MVER = busybox-1.9.1^[[24;20H^[[K^[[?12l^[[?25h^[[24;1H^M^M

:Busybox version is  busybox-1.9.1q^M

^[[24;1H^[[K^[[24;1H^[[?1l^[>^[[?1049l

************** STEP 2: Apply msh patch.

 

patching file msh.c

Hunk #1 FAILED at 19.

Hunk #2 succeeded at 229 with fuzz 2 (offset 85 lines).

Hunk #3 succeeded at 336 with fuzz 2 (offset 69 lines).

Hunk #4 FAILED at 448.

Hunk #5 succeeded at 1769 (offset -118 lines).

Hunk #6 succeeded at 2350 (offset -105 lines).

Hunk #7 succeeded at 2385 (offset -102 lines).

Hunk #8 succeeded at 2843 with fuzz 2 (offset -96 lines).

2 out of 8 hunks FAILED -- saving rejects to file msh.c.rej

child process exited abnormally

    while executing

"exec patch -p2 < ../../../../bfin_patch/msh_patch/busybox-msh.patch"

    (file "./build_msh_kernel.exp" line 35)^M

 

Follow-ups

 

--- Sonic Zhang                                              2008-04-10 03:45:49

msh patch is out of date after Mike upgrade busy box. Since our new AE will

rewrite msh in future, this patch is obsollete.

 

 

 

    Files

    Changes

    Commits

    Dependencies

    Duplicates

    Associations

    Tags

 

File Name     File Type     File Size     Posted By

No Files Were Found

Attachments

    Outcomes