Re: Linux Kernel based project in git

From: Avery Pennarun <apenwarr@gmail.com>
Date: Feb 2, 2010, 19:53 UTC
Message-ID: <32541b131002021153t53d19e32j56be356c219c5780@mail.gmail.com>
In-Reply-To: <9da7f2802f639777acfeb38eb1e3db90.squirrel@webmail.eisendle.net>

On Tue, Feb 2, 2010 at 4:05 AM,  <git@eisendle.net> wrote:

Show 14 quoted lines

> For release we always generate 3 patches:
> - BSP patch
> - USB patch (since USB part is an external patch comming from a 3rd party)
> - WiFi patch (same as for USB)
>
> So my question is:
> What's the best way for handling this inside the git repository?
>
> IMHO it would make sense to have 3 branches (BSP, USB, WiFi) each based on
> unmodified 2.6.22 Kernel. USB and WiFi branch is used for generating the
> patch and for applying possible fixes. BSP branch for actual BSP related
> feature development and fixes.
> The changes in these branches are merged into the master branch which is
> used for compiling/testing the whole BSP.

Are you planning to submit these patches upstream at any point? If not, it might be easiest to just jam them all together in one branch and not look back. Since it seems like they probably affect quite different parts of the code, you could always extract a clean set of patches *later* and submit those patches upstream.

But that's just my lazy advice :) The disadvantage to maintaining them in separate branches is that probably none of the three branches will work on its own anyway, since you don't have a physical device that only has the new USB device, or only the new WiFi device, or only needs the BSP but doesn't have updated USB or WiFi. Putting them in separate branches is therefore a bit artificial and won't buy you much.

Have fun,

Avery