On Fri, Sep 01, 2006 at 03:47:28PM +0100, Wookey wrote:
> On 06-09-01 11:09 +0100, Nick Bane wrote:
> > At some point the kernel tree should move to balloonboard. However,
> > ther may be several folks that have checkouts based on husaberg. How
> > do we handle this? May be one could do both and keep the monoloithic
> > kernel on husaberg and the patchset at balloonboard.
> 
> The main problem with retaining the monolithic svn kernel on husaberg
> is that people will keep using it due to inertia and we'll just be
> maintaining two versions, with important stuff only going in to the
> 'wrong' tree (very bad). I think we have to have a switchover
> day/week, but equally it has to be simple to switch, and it has to
> work for everybody (the bootldr import breakage being a
> lesson-in-point).
> 
> Tagging the import, or having a branch so that it is trivial to check
> out a version just like the one you were using yesterday is clearly a
> necessary first step.
> 
> I'll have a think about how best to do what's needed. Currently
> stalled on properly grokking quilt (which isn't hard, I just haven't
> done it yet).

What's the ultimate aim?

Currently there's an SVN tree on husaberg based on 2.6.16.5. This
probably works reasonably well as long as all future work is based off
2.6.16.5, but pulling in more recent kernel versions may not be easy
(though I guess can be done by patching a tree and committing?)

Sticking to a single kernel version will make it harder to push to
mainline, which is a constantly moving target.

My only other experience with this is the linux-omap lot. They have a
GIT tree that's synced from mainline for most releases (ie always for a
2.6.x release, and often for a 2.6.x-rcy release). All development
happens in this tree and then -omap patches are produced from it against
the vanilla 2.6.x releases so people building devices or just looking
for a known good set of patches can obtain them easily.

I've done a little bit of reading against quilt and it seems designed to
maintain patchsets. I'm not quite sure how well it fits into a system of
multiple people committing; I got the impression it was much more suited
for someone who was acting as a patch master and receiving patches from
numerous sources and collating them.

J.

-- 
                You're pretty cool sometimes, Beavis...
[ Black Cat Networks ] [ 0845 PAYG dialup ] [ ADSL from £20+VAT/month ]
                [ http://www.blackcatnetworks.co.uk/ ]