On Thu, Nov 15, 2007 at 02:53:45PM -0500, Dave Jones wrote:

I just checked something into devel/ that changes how we 'make prep'. Before, under kernel-2.6.23/ we had a vanilla dir and a fedora-patched dir called linux-2.6.23.noarch The vanilla dir used to be just the unpacked tarball. With the change I just checked in, that dir is now patched up to the latest upstream (ie, 2.6.24rc2-git5 right now).

This speeds up subsequent make preps quite a bit as the -rc's increase in size. The downside (and reason for this heads up) is that anyone with an existing checkout will find that make prep will now fail to apply patches as the specfile expects vanilla in the new form.

rm -rf kernel-2.6.23 and make prep again, and it'll all just work out.

I tweaked this some more. I found that I'd have had to have done that rm -rf every day when I rebased, which is less than fun. So now the 'vanilla' dir has the version postfixed to it. The downside is that this means that the kernel-2.6.23/ dir will get a bit cluttered over time with lots of symlink'd trees in your local checkouts, but it will dtrt.

There's room for a further optimisation which I'm too lazy to do right now, and that's to have a separate vanilla-$ver dir for both the -rc and the -git if present. This way rebasing to a new -git will use the previous vanilla-rc tree if present instead of regenerating it from scratch.

the %prep is also getting a bit messy with all of this hackery, so I'll probably end up cleaning it all up when I get around to doing that optimisation.

Seems to work right now though.

Dave