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

[Darren Hart]

On 08/08/2012 04: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.
> 
> Signed-off-by: Tom Zanussi <tom.zanussi at intel.com>

Acked-by: Darren Hart <dvhart at linux.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
> 

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Technical Lead - Linux Kernel