[linux-yocto] [PATCH 3/3] meta: fri2 - fix mixed emgd versions problem

[Kamble, Nitin A]

Tom & Bruce,
 Thanks for these commits. This makes me think, If we have a mechanism to avoid such collisions of duplicate features added by different methods (branch, patches), these issues can be automatically avoided.

Nitin



> -----Original Message-----
> From: Bruce Ashfield [mailto:bruce.ashfield at windriver.com]
> Sent: Thursday, August 09, 2012 6:48 AM
> To: Zanussi, Tom
> Cc: linux-yocto at yoctoproject.org; dvhart at linux.intel.com; Kamble, Nitin A
> Subject: Re: [PATCH 3/3] meta: fri2 - fix mixed emgd versions problem
> 
> On 12-08-08 7:05 PM, tom.zanussi at intel.com wrote:
> > From: Tom Zanussi<tom.zanussi at intel.com>
> >
> > The fri2 BSP includes the emgd-1.10 feature but merges the emgd-1.8
> > branch.  This change merges the 1.10 emgd branch as intended.
> 
> I'll add emgd-1.10 to the staging features, so you can fix the merge, and drop
> the include.
> 
> Bruce
> 
> >
> > Signed-off-by: Tom Zanussi<tom.zanussi at intel.com>
> > ---
> >   meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc |    2 +-
> >   1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc
> > b/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc
> > index 28f142e..a1f29c1 100644
> > --- a/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc
> > +++ b/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc
> > @@ -6,7 +6,7 @@ include ktypes/standard
> >   branch fri2
> >
> >   include features/emgd/emgd-1.10.scc
> > -git merge emgd
> > +git merge emgd-1.10
> >
> >   include fri2.scc
> >   include cfg/efi-ext.scc