summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-04-02 04:38:53 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-10 17:35:16 +0100
commit4f6259987f2c2bf4b81b6dfe712ae2fb8f18fc53 (patch)
tree67b9ee9369e525434a906260d3c958c0ada79841 /meta
parent4c6d49fe14f2e0397ed5427079f2f64d4b878162 (diff)
downloadpoky-4f6259987f2c2bf4b81b6dfe712ae2fb8f18fc53.tar.gz
linux-yocto/3.10: v3.10.35 and emenlow boot fixes
Updating the 3.10 SRCREVs to pick up 3.10.35 and a LTSI cherry pick that fixes a boot issue with the emenlow. (From OE-Core rev: f0990363aaeb3f8f7a8e02fc2acb0af2171e4eba) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb8
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.10.bb18
3 files changed, 16 insertions, 16 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 fe6773a5ec..98bf996a70 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
@@ -3,13 +3,13 @@ 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 ?= "f4351616572c6ad5a8b71b1becf02c3e779b85b8" 6SRCREV_machine ?= "d1e73a1e09f9641c44e7d713d1a6b5b088411459"
7SRCREV_machine_qemuppc ?= "a6dfc85e99633d739068a03d2551e39847628551" 7SRCREV_machine_qemuppc ?= "9a34d9c957e69f28e89e879d9dd6e8fe5c7270c5"
8SRCREV_meta ?= "df3aa753c8826127fb5ad811d56d57168551d6e4" 8SRCREV_meta ?= "b6e58b33dd427fe471f8827c83e311acdf4558a4"
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
12LINUX_VERSION ?= "3.10.34" 12LINUX_VERSION ?= "3.10.35"
13 13
14PV = "${LINUX_VERSION}+git${SRCPV}" 14PV = "${LINUX_VERSION}+git${SRCPV}"
15 15
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 123f3070d9..9e5c070c10 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
@@ -5,12 +5,12 @@ KBRANCH = "${KBRANCH_DEFAULT}"
5LINUX_KERNEL_TYPE = "tiny" 5LINUX_KERNEL_TYPE = "tiny"
6KCONFIG_MODE = "--allnoconfig" 6KCONFIG_MODE = "--allnoconfig"
7 7
8LINUX_VERSION ?= "3.10.34" 8LINUX_VERSION ?= "3.10.35"
9 9
10KMETA = "meta" 10KMETA = "meta"
11 11
12SRCREV_machine ?= "c7739be126930006e3bfbdb2fb070a967abc5e09" 12SRCREV_machine ?= "cee957655fe67826b2e827e2db41f156fa8f0cc4"
13SRCREV_meta ?= "df3aa753c8826127fb5ad811d56d57168551d6e4" 13SRCREV_meta ?= "b6e58b33dd427fe471f8827c83e311acdf4558a4"
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 10f4072021..f275693ae4 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
@@ -11,18 +11,18 @@ 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 ?= "52a6807f42846c7d1442e11227722f59221fc64e" 14SRCREV_machine_qemuarm ?= "7b466aae62395490769f96635bd077ee8f313f18"
15SRCREV_machine_qemumips ?= "b6b20f49e9a169a0672b7cc2d7b93d6652ca7873" 15SRCREV_machine_qemumips ?= "cc5059ae360e0586375bbd1ed46e1e6f3e267dea"
16SRCREV_machine_qemuppc ?= "d71b782615b802c78e1586494b94dd40531775c8" 16SRCREV_machine_qemuppc ?= "663a3068c9756137a84bbfb3a76eeae7cb4373e1"
17SRCREV_machine_qemux86 ?= "c7739be126930006e3bfbdb2fb070a967abc5e09" 17SRCREV_machine_qemux86 ?= "cee957655fe67826b2e827e2db41f156fa8f0cc4"
18SRCREV_machine_qemux86-64 ?= "c7739be126930006e3bfbdb2fb070a967abc5e09" 18SRCREV_machine_qemux86-64 ?= "cee957655fe67826b2e827e2db41f156fa8f0cc4"
19SRCREV_machine_qemumips64 ?= "88abb1eb327f4e3c711d19a228cb153fdd9b3506" 19SRCREV_machine_qemumips64 ?= "a1491c3b367a75c7003b2fb58706e3631413b337"
20SRCREV_machine ?= "c7739be126930006e3bfbdb2fb070a967abc5e09" 20SRCREV_machine ?= "cee957655fe67826b2e827e2db41f156fa8f0cc4"
21SRCREV_meta ?= "df3aa753c8826127fb5ad811d56d57168551d6e4" 21SRCREV_meta ?= "b6e58b33dd427fe471f8827c83e311acdf4558a4"
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
25LINUX_VERSION ?= "3.10.34" 25LINUX_VERSION ?= "3.10.35"
26 26
27PV = "${LINUX_VERSION}+git${SRCPV}" 27PV = "${LINUX_VERSION}+git${SRCPV}"
28 28