[SSI-devel] Re: kernel.patches question
Brought to you by:
brucewalker,
rogertsang
From: Brian J. W. <Bri...@hp...> - 2004-09-21 03:15:54
|
En Chiang Lee wrote: > Hi Brian, > > How are the patches in openssi/kernel.patches directory generated? > > The build failed today because the patching of the kernel failed, so I > was wondering how to fix it. But my problem is that I don't know how the > patch was generated. So could you tell me the procedure of generating > these patches so that the build failures can be fixed sooner. Hi En Chiang, Before you think the patch is broken, consider whether something else might be wrong. If the base kernel changed, you need to extract the new kernel tarball in srpms/. Another possibility is that you updated openssi/, but not ci/. Something else to consider is that somebody accidentally checked in a file with a patch already applied (such as kdb). If you're certain the patch is broken, here's how to fix it: 1) Follow instructions in docs/devel/INSTALL.cvs to run `make kern'. 2) Move linux-ssi/ to o/ 3) Run `cp -al o n' 4) Apply the broken patch to n/ 5) Resolve the conflicts (.rej files) 6) Remove all *.rej, *.orig, *~ and tags (cscope, etc.) files from n. 7) Run `diff -Nar -U4 o n >patch_name' 8) Compare the new patch to the old one. It should be approximately the same size. Also, a diff of the two should only show different timestamps, context changes and changes to the patched code that you know you made. 9) Checkin the modified patch. Eventually, it might be nice to use quilt to manage patches. It automates many of the steps above. Regards, Brian |