From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robin Farine To: niky Cc: ecos-discuss@sources.redhat.com Subject: Re: [ECOS] Re: how to apply the patches for i386 Date: Thu, 30 Nov 2000 02:07:00 -0000 Message-id: <3A261E88.B0B5EF2D@acn.ch> References: <200011300304.LAA26871@ntucst.csie.ntu.edu.tw> X-SW-Source: 2000-11/msg00400.html 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