linux-yocto/3.8: fix tree patching

The xilinx guys noticed that my recent commit to the kernel's meta branch to ensure that modified files were tracked was a bit premature and caused a mismatch in the .gitignore between the meta branch and the BSP branches. Which meant that a dirty file was present in the BSP branches, breaking git application of patches to the tree.

I'm reverting the change for now, and will fix it properly with the new yocto 1.5 kernel and tools.

Cheers,

Bruce

The following changes since commit 31e6eee860b5f9f4ac9ef0889bcff5648de6e3f9:

poky-tiny.conf: blacklist core-image-weston option (2013-07-18 21:26:58 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib zedd/kernel
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (1):
linux-yocto/3.8: revert .gitignore: do not ignore meta directory

 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(-)

1.7.10.4

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.

---
 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(-)

index 6d52ecc..adb29e7 100644
@@ -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}"

index c657675..8a91e2c 100644
@@ -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}"

index f71af05..d389d6b 100644
@@ -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"
 

1.7.10.4