This is the mail archive of the ecos-discuss@sources.redhat.com mailing list for the eCos project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Re: Re: how to apply the patches for i386


niky wrote:
> 
> Hi,
> 
>     After I applied the perl script to the patch, there are some problems
> from the patchs. I checked out the packages from anoncvs.
> 
> patching file hal/i386/arch/current/src/vectors.S
> Hunk #7 FAILED at 228.
> 1 out of 9 hunks FAILED -- saving rejects to file
> hal/i386/arch/current/src/vectors.S.rej
> ...
> Reversed (or previously applied) patch detected!  Assume -R? [n]
> Apply anyway? [n] y
> Hunk #1 FAILED at 65.
> Hunk #2 FAILED at 92.
> Hunk #3 FAILED at 155.
> Hunk #4 FAILED at 170.
> Hunk #5 succeeded at 198 (offset -11 lines).
> Hunk #6 succeeded at 332 (offset 3 lines).
> Hunk #7 succeeded at 402 (offset -11 lines).
> Hunk #8 succeeded at 438 (offset 3 lines).
> 4 out of 8 hunks FAILED -- saving rejects to file
> ...
> 
>     What can I do ?
>     Thanks.

Look at hal/i386/arch/current/src/vectors.S.rej, compare with the
original chunks and manually merge the changes.

Robin

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]