[linux-yocto] [PATCH 1/3] meta: comment out emgd-1.14.scc patch statements

[Bruce Ashfield]

On 12-08-08 7:05 PM, tom.zanussi at intel.com wrote:
> From: Tom Zanussi<tom.zanussi at intel.com>
>
> Current usage is to include features/emgd/emgd-1.14 and then git merge
> emgd-1.14.  If the patches are applied here, the git merge fails, so
> comment the patch statements out as done elsewhere e.g. in the 3.2
> tree.

I've already got a different fix for this staged in the kernel-cache.
The emgd feature is moved to a staging feature, and nothing includes
it anymore .. only the staging feature itself. The patches are valid,
just not to be included by BSPs.

http://git.yoctoproject.org/cgit/cgit.cgi/yocto-kernel-cache/commit/?id=bbe2b2c6db5e385861f84d6b927c77c8cd580aef

Bruce

>
> Signed-off-by: Tom Zanussi<tom.zanussi at intel.com>
> ---
>   meta/cfg/kernel-cache/features/emgd/emgd-1.14.scc |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/cfg/kernel-cache/features/emgd/emgd-1.14.scc b/meta/cfg/kernel-cache/features/emgd/emgd-1.14.scc
> index ef80aa3..2db6ffa 100644
> --- a/meta/cfg/kernel-cache/features/emgd/emgd-1.14.scc
> +++ b/meta/cfg/kernel-cache/features/emgd/emgd-1.14.scc
> @@ -1,4 +1,4 @@
>   git branch emgd-1.14 master
>
> -patch yocto-emgd-emgd-1.14-driver.patch
> -patch emgd-pvr-get-it-building-with-v3.4-kernel.patch
> +# patch yocto-emgd-emgd-1.14-driver.patch
> +# patch emgd-pvr-get-it-building-with-v3.4-kernel.patch