From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Wed, 24 Jul 2013 04:32:33 +0000 (-0400)
Subject: linux-yocto/3.8: revert .gitignore: do not ignore meta directory
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=462acd212a9e7364ce329a4fc70aa09ab93628b3;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

linux-yocto/3.8: revert .gitignore: do not ignore meta directory

We made a change to allow meta branch/directory changes to be visible
when working with the kernel tree. But without associated tool changes
.gitignore is different between branches and hence causes errors when
changing branches and processing the tree.

The tools changes are not ready yet, so to avoid patching issues,
temporarily reverting the change.

(From OE-Core rev: f7e66abf279781d7c0cc1fb3c32c93c15a83c52c)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb
index 6d52ecc3f44..adb29e75a27 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb
@@ -10,7 +10,7 @@ KMETA = "meta"
 
 SRCREV_machine ?= "4fb187301ca153d496b2a96293dffde34d3b1a56"
 SRCREV_machine_qemuppc ?= "547c4ea570933ab7ece9f10d2c46875b460cd337"
-SRCREV_meta ?= "8ef9136539464c145963ac2b8ee0196fea1c2337"
+SRCREV_meta ?= "375cb6ebfdb23b0e81cc557bdd4dd39fab29bc50"
 
 PR = "${INC_PR}.1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb
index c657675094c..8a91e2cbf8a 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb
@@ -13,7 +13,7 @@ LINUX_VERSION ?= "3.8.13"
 KMETA = "meta"
 
 SRCREV_machine ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
-SRCREV_meta ?= "8ef9136539464c145963ac2b8ee0196fea1c2337"
+SRCREV_meta ?= "375cb6ebfdb23b0e81cc557bdd4dd39fab29bc50"
 
 PR = "${INC_PR}.1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.8.bb b/meta/recipes-kernel/linux/linux-yocto_3.8.bb
index f71af0541c7..d389d6b5cbd 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.8.bb
@@ -10,7 +10,7 @@ SRCREV_machine_qemuppc ?= "698eada61d9385b42dd117858b943655b565084b"
 SRCREV_machine_qemux86 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
 SRCREV_machine_qemux86-64 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
 SRCREV_machine ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
-SRCREV_meta ?= "8ef9136539464c145963ac2b8ee0196fea1c2337"
+SRCREV_meta ?= "375cb6ebfdb23b0e81cc557bdd4dd39fab29bc50"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"