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

[Bruce Ashfield]

On 12-08-08 7:05 PM, tom.zanussi at intel.com wrote:
> From: Tom Zanussi<tom.zanussi at intel.com>
>
> The crownbay BSP includes the emgd-1.10 feature but merges the
> emgd-1.14 branch.  This change includes the 1.14 feature, which will
> now work because the 1.14 feature has been fixed in the previous
> patch.

Just the merge is enough. Drop the include completely.

Bruce

>
> Signed-off-by: Tom Zanussi<tom.zanussi at intel.com>
> ---
>   .../bsp/crownbay/crownbay-standard.scc             |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/meta/cfg/kernel-cache/bsp/crownbay/crownbay-standard.scc b/meta/cfg/kernel-cache/bsp/crownbay/crownbay-standard.scc
> index cbda721..36d8e95 100644
> --- a/meta/cfg/kernel-cache/bsp/crownbay/crownbay-standard.scc
> +++ b/meta/cfg/kernel-cache/bsp/crownbay/crownbay-standard.scc
> @@ -5,7 +5,7 @@ define KARCH i386
>   include ktypes/standard
>   branch crownbay
>
> -include features/emgd/emgd-1.10.scc
> +include features/emgd/emgd-1.14.scc
>   git merge emgd-1.14
>
>   include crownbay.scc