Hi.
I'm feeling adventurous and am going to patch my vanilla sources with some patches. Especially the 4500_fbsplash-0.9.1-r2.patch is giving me errors about rejected hunks. My question is: how do I process these failed hunks in *.rej files? Should I process them manually (Oh my!) or is there an automated/scripted method?
I've googled a lot but I always fall on this article, based on older kernel versions. But I have no config.in.rej here.
Thanks for any hint.
Kernel patching: how can I process rejects?
Message
- NeddySeagoon
- Administrator
- Posts: 56082
- Joined: Sat Jul 05, 2003 9:37 am
- Location: 56N 3W
VinzC,
The automated method failed and wrote the *.rej files.
The easiest way is to find patches for the kerenk you have, or use the kerenl the patches were made against.
Other than than, use your C skills to patch by hand. How hard it is depends on the reasons for the rejections.
It may be that (some) rejected hunks are already present or the original code at the line number given for the hunk has changed so that patch cannot find any context.
The automated method failed and wrote the *.rej files.
The easiest way is to find patches for the kerenk you have, or use the kerenl the patches were made against.
Other than than, use your C skills to patch by hand. How hard it is depends on the reasons for the rejections.
It may be that (some) rejected hunks are already present or the original code at the line number given for the hunk has changed so that patch cannot find any context.
Regards,
NeddySeagoon
Computer users fall into two groups:-
those that do backups
those that have never had a hard drive fail.
NeddySeagoon
Computer users fall into two groups:-
those that do backups
those that have never had a hard drive fail.
Thanks NeddySeagoon.
I tried to fix rejections manually. Indeed there were too many differences between what the patch expected and the actual content. I was trying to patch vanilla sources with 4500_fbsplash-0.9.1-r2.patch. Patching resulted in too big differences. So I might have patched with the wrong diff file or whatever. The only patch (out of two attempts, which is not that bad after all
) that worked is the inotify patch.
I think I'll use Gentoo sources for framebuffer consoles and bootsplash screen instead.
I tried to fix rejections manually. Indeed there were too many differences between what the patch expected and the actual content. I was trying to patch vanilla sources with 4500_fbsplash-0.9.1-r2.patch. Patching resulted in too big differences. So I might have patched with the wrong diff file or whatever. The only patch (out of two attempts, which is not that bad after all
) that worked is the inotify patch.I think I'll use Gentoo sources for framebuffer consoles and bootsplash screen instead.
You may try Chris Mason's "rej" tool:
http://www.kerneltrap.org/node/4982at that point Chris Mason's "rej" tool is pretty nifty:
ftp://ftp.suse.com/pub/people/mason/rej/rej-0.13.tar.gz
it gets the trivial rejects right, and is pretty powerful to quickly
cycle through the nontrivial ones too. It shows the old and new code
side by side too, etc.