summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-01-18 00:19:31 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-18 13:28:10 +0000
commit09d0bc521ad34473acf2ec4a00a69c3e3183f7d9 (patch)
treedb22ec90ce18f4be474553b8516348e0be00ca0b
parent97fdac7cfc6ae7ab9643f261728cac6b68df7e4b (diff)
downloadpoky-09d0bc521ad34473acf2ec4a00a69c3e3183f7d9.tar.gz
linux-yocto/3.4: integrate LTSI-3.4
Updating the linux-yocto-3.4 SRCREVS to activate the merge of the 3.4.25-ltsi tree: http://git.linuxfoundation.org/?p=ltsi-kernel.git;a=tag;h=refs/tags/v3.4.25-ltsi The pristine patch queue can be seen on the "ltsi" branch in the repository. This branch has been merged into the standard/base branch of linux-yocto-3.4 and to all BSP branches in the tree. LTSI based BSPs or features are not activated as part of this commit, they are controlled by the meta branch of the kernel repository and are activated in separate patches. [YOCTO #2396] (From OE-Core rev: 8f03ebe9b164e0c0493c56d9eb2e7d0b039832f1) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.4.bb12
3 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
index bcac39530b..25e9a10f84 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
@@ -8,8 +8,8 @@ LINUX_KERNEL_TYPE = "preempt-rt"
8 8
9KMETA = "meta" 9KMETA = "meta"
10 10
11SRCREV_machine ?= "729e8634f75bf10582916eae6b5b96325785c001" 11SRCREV_machine ?= "086782fe576d96cda54068a2248c697a9f1946c6"
12SRCREV_machine_qemuppc ?= "15ce18fac50c49ea4893b0d7ed3d0086ef9c7448" 12SRCREV_machine_qemuppc ?= "4a3d7cbda063ece64ba286749e23bfd4b81831b8"
13SRCREV_meta ?= "2cbb5aca2c25e37b04828cf0b7d90e2f22af816e" 13SRCREV_meta ?= "2cbb5aca2c25e37b04828cf0b7d90e2f22af816e"
14 14
15PR = "${INC_PR}.0" 15PR = "${INC_PR}.0"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
index 984476fba7..17eb6dde88 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb
@@ -12,7 +12,7 @@ LINUX_VERSION ?= "3.4.24"
12 12
13KMETA = "meta" 13KMETA = "meta"
14 14
15SRCREV_machine ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f" 15SRCREV_machine ?= "7146d001a5f95068a3e2da23a8b3d15aeb20087a"
16SRCREV_meta ?= "2cbb5aca2c25e37b04828cf0b7d90e2f22af816e" 16SRCREV_meta ?= "2cbb5aca2c25e37b04828cf0b7d90e2f22af816e"
17 17
18PR = "${INC_PR}.0" 18PR = "${INC_PR}.0"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index 0ac51b904c..62eb4be70d 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -3,12 +3,12 @@ require recipes-kernel/linux/linux-yocto.inc
3KBRANCH_DEFAULT = "standard/base" 3KBRANCH_DEFAULT = "standard/base"
4KBRANCH = "${KBRANCH_DEFAULT}" 4KBRANCH = "${KBRANCH_DEFAULT}"
5 5
6SRCREV_machine_qemuarm ?= "50986c7d971c28505acdbdcab6601f4d5b6dbff4" 6SRCREV_machine_qemuarm ?= "2ed05c280920e592f62d09bda15ab006baffa996"
7SRCREV_machine_qemumips ?= "4d355c57fe0d9f117c272f1679fa3d3f451a8c8e" 7SRCREV_machine_qemumips ?= "81ef4ad8f02c979a236a460c6831dcb4fbf2ef3c"
8SRCREV_machine_qemuppc ?= "1c8a1aa8cc839f0328edbfe0d755100368bc4ae6" 8SRCREV_machine_qemuppc ?= "6b5d5a60ca6c3cf05d28c9ad447c133563340232"
9SRCREV_machine_qemux86 ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f" 9SRCREV_machine_qemux86 ?= "7146d001a5f95068a3e2da23a8b3d15aeb20087a"
10SRCREV_machine_qemux86-64 ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f" 10SRCREV_machine_qemux86-64 ?= "7146d001a5f95068a3e2da23a8b3d15aeb20087a"
11SRCREV_machine ?= "5432e2acb6053f9f7563cf63abd101ed2fdc1b6f" 11SRCREV_machine ?= "7146d001a5f95068a3e2da23a8b3d15aeb20087a"
12SRCREV_meta ?= "2cbb5aca2c25e37b04828cf0b7d90e2f22af816e" 12SRCREV_meta ?= "2cbb5aca2c25e37b04828cf0b7d90e2f22af816e"
13 13
14SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" 14SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"