Patchwork [1/1] linux-yocto/3.8: revert .gitignore: do not ignore meta directory

login
register
mail settings
Submitter Bruce Ashfield
Date July 24, 2013, 4:32 a.m.
Message ID <177ae6bf92d2eed442287e0df0beddf5912d25e5.1374639525.git.bruce.ashfield@windriver.com>
Download mbox | patch
Permalink /patch/54279/
State Accepted
Commit f7e66abf279781d7c0cc1fb3c32c93c15a83c52c
Headers show

Comments

Bruce Ashfield - July 24, 2013, 4:32 a.m.
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.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb   |    2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.8.bb      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Patch

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 6d52ecc..adb29e7 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 c657675..8a91e2c 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 f71af05..d389d6b 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"