summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-02-14 19:13:56 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-14 22:58:45 (GMT)
commit9be7accfecfdbf0677598055f70d11c7e0fe0681 (patch)
tree32290d1d6f3f12bab601753a4d62f1854b59895a /meta/recipes-kernel/linux
parent3fefbe35c377efe777afb37a1b7403be5ce9a8ec (diff)
downloadpoky-9be7accfecfdbf0677598055f70d11c7e0fe0681.tar.gz
linux-yocto/3.10: add minnow-io feature to LTSI
The initial merge of the LTSI 3.10 content was missing the minnow-io feature. This has now been added to standard/ltsi and merged to all branches in the tree. We also update the meta branch to ensure that the existing feature will not attempt to apply patches to the tree, since they have now been integrated. (From OE-Core rev: 8569e2488e45fc7cabbdafe240ca404b2b2e8519) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.10.bb16
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
index 1c05772..b5bde68 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
@@ -3,9 +3,9 @@ require recipes-kernel/linux/linux-yocto.inc
3KBRANCH = "standard/preempt-rt/base" 3KBRANCH = "standard/preempt-rt/base"
4KBRANCH_qemuppc = "standard/preempt-rt/qemuppc" 4KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
5 5
6SRCREV_machine ?= "f6d02c6f5184c6be256edff161acbf29789c89d2" 6SRCREV_machine ?= "f17f18f928d3af8b18b69fdf224b3e4ed86dbfbf"
7SRCREV_machine_qemuppc ?= "e883b7073c758d82e3b409ef98c35099ad69a63b" 7SRCREV_machine_qemuppc ?= "82c9f3bfe1c97ba8b653bff8d4e030cf54bc1de7"
8SRCREV_meta ?= "713abc0efa9fc21234b2f342d0a849e4a4a36c65" 8SRCREV_meta ?= "d57f7367a5f44a47b84425bb48601b41c6d0ed8a"
9 9
10SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta" 10SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
11 11
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
index 5e33b1f..48d6082 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "3.10.28"
9 9
10KMETA = "meta" 10KMETA = "meta"
11 11
12SRCREV_machine ?= "e9cdab78bed262dbeadc7f403989f20972bcddde" 12SRCREV_machine ?= "3e0a296fae952d8d93eb0f96566bf6d4a978c8ee"
13SRCREV_meta ?= "713abc0efa9fc21234b2f342d0a849e4a4a36c65" 13SRCREV_meta ?= "d57f7367a5f44a47b84425bb48601b41c6d0ed8a"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
16 16
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
index baea8ae..32d5fee 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
@@ -11,14 +11,14 @@ KBRANCH_qemux86 = "standard/common-pc/base"
11KBRANCH_qemux86-64 = "standard/common-pc-64/base" 11KBRANCH_qemux86-64 = "standard/common-pc-64/base"
12KBRANCH_qemumips64 = "standard/mti-malta64" 12KBRANCH_qemumips64 = "standard/mti-malta64"
13 13
14SRCREV_machine_qemuarm ?= "978f148bf7dd253c901d4b16401309fc50eed0a9" 14SRCREV_machine_qemuarm ?= "51f493f9716a76fbfe911bfdefca7e9a42a5ca13"
15SRCREV_machine_qemumips ?= "0d1b0e40b279433b1a96ed8ee02a10f6d2c7bea7" 15SRCREV_machine_qemumips ?= "633b2257f21082fd3a784a4417b421e9cd008045"
16SRCREV_machine_qemuppc ?= "ae9aa3e76bcc720993b02830b1cae9b15ae9b6c6" 16SRCREV_machine_qemuppc ?= "37465d34ea1aba381082d22a880774b3b3b31af3"
17SRCREV_machine_qemux86 ?= "e9cdab78bed262dbeadc7f403989f20972bcddde" 17SRCREV_machine_qemux86 ?= "3e0a296fae952d8d93eb0f96566bf6d4a978c8ee"
18SRCREV_machine_qemux86-64 ?= "e9cdab78bed262dbeadc7f403989f20972bcddde" 18SRCREV_machine_qemux86-64 ?= "3e0a296fae952d8d93eb0f96566bf6d4a978c8ee"
19SRCREV_machine_qemumips64 ?= "38d9a2f8f334e1896629572f25968f34d8fb188d" 19SRCREV_machine_qemumips64 ?= "fe1fab7061b8369deca03b2ec59f186bdbe2b8d9"
20SRCREV_machine ?= "e9cdab78bed262dbeadc7f403989f20972bcddde" 20SRCREV_machine ?= "3e0a296fae952d8d93eb0f96566bf6d4a978c8ee"
21SRCREV_meta ?= "713abc0efa9fc21234b2f342d0a849e4a4a36c65" 21SRCREV_meta ?= "d57f7367a5f44a47b84425bb48601b41c6d0ed8a"
22 22
23SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" 23SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
24 24