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

tom.zanussi at intel.com tom.zanussi at intel.com
Wed Aug 8 16:05:16 PDT 2012


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.

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
-- 
1.7.4.1




More information about the linux-yocto mailing list