summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-02-27 21:02:15 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-28 14:01:14 (GMT)
commitc7d9a07791556147332efabfaf2250db58f9c93d (patch)
tree0a3e7486fa49b609c6e4a1739e299d3b7dba507c
parent967fca6f34115da7cb3448d0a00f6a1104635cc1 (diff)
downloadpoky-c7d9a07791556147332efabfaf2250db58f9c93d.tar.gz
linux-yocto/3.10: integrate latest LTSI changes
Integrating the latest 3.10 LTSI changes into the yocto tree. (From OE-Core rev: 19e9dded1761e09ed713c72c7153501e625a3859) 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.10.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.10.bb14
3 files changed, 10 insertions, 10 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 31ff036..f0c732b 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
@@ -3,8 +3,8 @@ 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 ?= "a2475c1d9dc32b7171de28d196ace4a9df06edbd" 6SRCREV_machine ?= "5f466af88f885705efe0f018c027b2631f6724e4"
7SRCREV_machine_qemuppc ?= "84ab418469d7da9b710ce9e3cbc49e6fb9bd4e05" 7SRCREV_machine_qemuppc ?= "e497cba7496e4ae6fc4d018bce57695a61766d22"
8SRCREV_meta ?= "7b3b87d4d5e4c41c235da13aaa9f45d5d338e2c6" 8SRCREV_meta ?= "7b3b87d4d5e4c41c235da13aaa9f45d5d338e2c6"
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"
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 34bb276..2ceb946 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "3.10.32"
9 9
10KMETA = "meta" 10KMETA = "meta"
11 11
12SRCREV_machine ?= "a86e2b1eadd1f607d0d6ac5c4ab20a902714ddb1" 12SRCREV_machine ?= "78afd3095c9b37efbbfbfdc25eb3833ef3c6a718"
13SRCREV_meta ?= "7b3b87d4d5e4c41c235da13aaa9f45d5d338e2c6" 13SRCREV_meta ?= "7b3b87d4d5e4c41c235da13aaa9f45d5d338e2c6"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
index 55d46fa..9bc8735 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
@@ -11,13 +11,13 @@ 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 ?= "df5844fa448e31927884d1850cfcc9bea981165c" 14SRCREV_machine_qemuarm ?= "c295c53987007a5d0c87cc9b23125e9ff85900bd"
15SRCREV_machine_qemumips ?= "4ffaa6116722ced25c4f775990f445c353d5b8e9" 15SRCREV_machine_qemumips ?= "2833be8c96671b24a203a5dc45a21c38d5d841c3"
16SRCREV_machine_qemuppc ?= "db7c6be000d0a07d8b31561753c83ccbb4ae41ab" 16SRCREV_machine_qemuppc ?= "cf413ddca8b974a473b72635e1499223a02d7949"
17SRCREV_machine_qemux86 ?= "a86e2b1eadd1f607d0d6ac5c4ab20a902714ddb1" 17SRCREV_machine_qemux86 ?= "78afd3095c9b37efbbfbfdc25eb3833ef3c6a718"
18SRCREV_machine_qemux86-64 ?= "a86e2b1eadd1f607d0d6ac5c4ab20a902714ddb1" 18SRCREV_machine_qemux86-64 ?= "78afd3095c9b37efbbfbfdc25eb3833ef3c6a718"
19SRCREV_machine_qemumips64 ?= "fe0da5cbc516f7686af316cdeafaf7b7e8d34d7d" 19SRCREV_machine_qemumips64 ?= "3e1899546c014808fed8d336b777bf8d81f50d7b"
20SRCREV_machine ?= "a86e2b1eadd1f607d0d6ac5c4ab20a902714ddb1" 20SRCREV_machine ?= "78afd3095c9b37efbbfbfdc25eb3833ef3c6a718"
21SRCREV_meta ?= "7b3b87d4d5e4c41c235da13aaa9f45d5d338e2c6" 21SRCREV_meta ?= "7b3b87d4d5e4c41c235da13aaa9f45d5d338e2c6"
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"