From: Sean M. <sea...@me...> - 2003-05-26 18:01:46
|
Hello, I'm trying to applu host-skas3.patch (patch -p1 <host-skas3.patch) to a standard Debian 3.0 Kernel (2.4.18). It seems to get most of the way done, and then fails with: patching file mm/mprotect.c Hunk #2 FAILED at 281. 1 out of 3 hunks FAILED -- saving rejects to file mm/mprotect.c.rej I am not versed in patches, so any suggestions on how to get this working would be appreciated. I'd like to stick with this kernel, as we've standardized on it across numerous systems. Thanks in advance. -Sean |
From: Jan H. <bu...@uc...> - 2003-05-28 14:35:00
|
On Mon, May 26, 2003 at 02:00:58PM -0400, Sean McAvoy wrote: > Hello, > I'm trying to applu host-skas3.patch (patch -p1 <host-skas3.patch) to a > standard Debian 3.0 Kernel (2.4.18). It seems to get most of the way > done, and then fails with: > patching file mm/mprotect.c > Hunk #2 FAILED at 281. > 1 out of 3 hunks FAILED -- saving rejects to file mm/mprotect.c.rej > > I am not versed in patches, so any suggestions on how to get this > working would be appreciated. I'd like to stick with this kernel, as > we've standardized on it across numerous systems. Well, I don't see any chance but to hand-apply the patch. Patches (especially the unified format) are quite simple to understand, so if you know a bit C, you should be able to hand-apply it. Each patch is made of chunks. First old and new file names are stated, prefixed with --- and +++ resp. Then there are chunks for that file. Each starts with: @@ -<old-position>,<old-length> +<new-position>,<new-length> That will give you the approximate line where you should look for the touched code. Then tere are lines of code. If you take only the lines prefixed with space or -, you get the old code. If you take those prefixed with space or +, you get the new code. You will find only the part that patch failed to apply in the .rej file, so you don't have to bother about the rest of the patch. ------------------------------------------------------------------------------- Jan 'Bulb' Hudec <bu...@uc...> |
From: Jan H. <bu...@uc...> - 2003-05-28 14:39:15
|
On Mon, May 26, 2003 at 02:00:58PM -0400, Sean McAvoy wrote: > Hello, > I'm trying to applu host-skas3.patch (patch -p1 <host-skas3.patch) to a > standard Debian 3.0 Kernel (2.4.18). It seems to get most of the way > done, and then fails with: > patching file mm/mprotect.c > Hunk #2 FAILED at 281. > 1 out of 3 hunks FAILED -- saving rejects to file mm/mprotect.c.rej > > I am not versed in patches, so any suggestions on how to get this > working would be appreciated. I'd like to stick with this kernel, as > we've standardized on it across numerous systems. ... one more idea. Since all debian stuff comes as original source and a bunch of patches, you can take a look which of the debian patches touches mm/mprotect.c around the critical spot. Hopefuly it's not a key patch and you could simply take it out. Note however, that the patch is against 2.4.19 - it might be that the change is between official kernels (then upgrading to a newer kernel would perhaps be best idea). ------------------------------------------------------------------------------- Jan 'Bulb' Hudec <bu...@uc...> |