Best way to maintain local changes?

[Cliff Brake]

On Wed, Oct 8, 2008 at 5:04 PM, JustinLove <justin.love at cesgames.com> wrote:
> Is there a good way to maintain a small number of local
> customizations/patches while staying synced with upstream changes?

I use a mixture of bitbake overlays and modifications tracked in git.

1) overlay - for completely new packages/conf files.  It is rather
nice to have completely custom packages that will never get pushed
into mainstream completely decoupled from the OE tree as you can then
more easily switch OE trees, etc.  This is a very nice feature of OE.

2) tweaks to existing packages -- simply track in git as git is very
good at tracking local changes and merging upstream changes.  It also
makes it much easier to push changes back upstream than if changes are
in an overlay.  Initially, I simply copied the package to the overlay
and changed it, but it is very difficult to figure out what you
changed unless you take careful notes -- this is what a SCM is for.

Cliff

-- 
=======================
Cliff Brake
http://bec-systems.com