summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-07-24 04:32:33 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-29 12:09:05 (GMT)
commit462acd212a9e7364ce329a4fc70aa09ab93628b3 (patch)
tree64a4565537584fdb9b55ee858a95e588a4cfb3c4
parent3e2a6808162f5311421b4e43bf665e5241241d9e (diff)
downloadpoky-462acd212a9e7364ce329a4fc70aa09ab93628b3.tar.gz
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>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.8.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.8.bb2
3 files changed, 3 insertions, 3 deletions
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"
10 10
11SRCREV_machine ?= "4fb187301ca153d496b2a96293dffde34d3b1a56" 11SRCREV_machine ?= "4fb187301ca153d496b2a96293dffde34d3b1a56"
12SRCREV_machine_qemuppc ?= "547c4ea570933ab7ece9f10d2c46875b460cd337" 12SRCREV_machine_qemuppc ?= "547c4ea570933ab7ece9f10d2c46875b460cd337"
13SRCREV_meta ?= "8ef9136539464c145963ac2b8ee0196fea1c2337" 13SRCREV_meta ?= "375cb6ebfdb23b0e81cc557bdd4dd39fab29bc50"
14 14
15PR = "${INC_PR}.1" 15PR = "${INC_PR}.1"
16PV = "${LINUX_VERSION}+git${SRCPV}" 16PV = "${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"
13KMETA = "meta" 13KMETA = "meta"
14 14
15SRCREV_machine ?= "f20047520a57322f05d95a18a5fbd082fb15cb87" 15SRCREV_machine ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
16SRCREV_meta ?= "8ef9136539464c145963ac2b8ee0196fea1c2337" 16SRCREV_meta ?= "375cb6ebfdb23b0e81cc557bdd4dd39fab29bc50"
17 17
18PR = "${INC_PR}.1" 18PR = "${INC_PR}.1"
19PV = "${LINUX_VERSION}+git${SRCPV}" 19PV = "${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"
10SRCREV_machine_qemux86 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87" 10SRCREV_machine_qemux86 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
11SRCREV_machine_qemux86-64 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87" 11SRCREV_machine_qemux86-64 ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
12SRCREV_machine ?= "f20047520a57322f05d95a18a5fbd082fb15cb87" 12SRCREV_machine ?= "f20047520a57322f05d95a18a5fbd082fb15cb87"
13SRCREV_meta ?= "8ef9136539464c145963ac2b8ee0196fea1c2337" 13SRCREV_meta ?= "375cb6ebfdb23b0e81cc557bdd4dd39fab29bc50"
14 14
15SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" 15SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
16 16