diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-01-20 00:28:29 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-20 12:58:57 +0000 |
commit | 0fdb0aed3b11f49476aab4f9d83ae49e3eac41a4 (patch) | |
tree | 5847b9efc6afd478e7f2481f0f0ec920fe3683eb | |
parent | e4410b565853c0e4d54d6100cb6f65336119b34b (diff) | |
download | poky-0fdb0aed3b11f49476aab4f9d83ae49e3eac41a4.tar.gz |
linux-yocto/3.4: update to 3.4.26 and 3.4.25-rt37
Updating the yocto 3.4 kernel tree to the 3.4.25 and 3.4.26 -stable updates
as well as refreshing the preempt-rt branches to 3.4.25-rt37.
(From OE-Core rev: da536703bdcf31c8c2ef17f5a49d06280fe77600)
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.bb | 8 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_3.4.bb | 16 |
3 files changed, 15 insertions, 15 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 25e9a10f84..ca5eeda32a 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb | |||
@@ -3,14 +3,14 @@ require recipes-kernel/linux/linux-yocto.inc | |||
3 | KBRANCH = "standard/preempt-rt/base" | 3 | KBRANCH = "standard/preempt-rt/base" |
4 | KBRANCH_qemuppc = "standard/preempt-rt/qemuppc" | 4 | KBRANCH_qemuppc = "standard/preempt-rt/qemuppc" |
5 | 5 | ||
6 | LINUX_VERSION ?= "3.4.24" | 6 | LINUX_VERSION ?= "3.4.26" |
7 | LINUX_KERNEL_TYPE = "preempt-rt" | 7 | LINUX_KERNEL_TYPE = "preempt-rt" |
8 | 8 | ||
9 | KMETA = "meta" | 9 | KMETA = "meta" |
10 | 10 | ||
11 | SRCREV_machine ?= "086782fe576d96cda54068a2248c697a9f1946c6" | 11 | SRCREV_machine ?= "408343900a234254d7be8f0bb52d6f87c8fbbc76" |
12 | SRCREV_machine_qemuppc ?= "4a3d7cbda063ece64ba286749e23bfd4b81831b8" | 12 | SRCREV_machine_qemuppc ?= "bd7b26015e1dcbed4e8e0e9b6ac2ef4c744e0257" |
13 | SRCREV_meta ?= "2cbb5aca2c25e37b04828cf0b7d90e2f22af816e" | 13 | SRCREV_meta ?= "3b37e8fd4c88d5d3dce94fc1a80aee49a60a69a8" |
14 | 14 | ||
15 | PR = "${INC_PR}.0" | 15 | PR = "${INC_PR}.0" |
16 | PV = "${LINUX_VERSION}+git${SRCPV}" | 16 | PV = "${LINUX_VERSION}+git${SRCPV}" |
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 17eb6dde88..67a9c871ab 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb | |||
@@ -8,12 +8,12 @@ KBRANCH = "${KBRANCH_DEFAULT}" | |||
8 | LINUX_KERNEL_TYPE = "tiny" | 8 | LINUX_KERNEL_TYPE = "tiny" |
9 | KCONFIG_MODE = "--allnoconfig" | 9 | KCONFIG_MODE = "--allnoconfig" |
10 | 10 | ||
11 | LINUX_VERSION ?= "3.4.24" | 11 | LINUX_VERSION ?= "3.4.26" |
12 | 12 | ||
13 | KMETA = "meta" | 13 | KMETA = "meta" |
14 | 14 | ||
15 | SRCREV_machine ?= "7146d001a5f95068a3e2da23a8b3d15aeb20087a" | 15 | SRCREV_machine ?= "59c2a9eb334c2def405c9d93ed6d8d4e822d1945" |
16 | SRCREV_meta ?= "2cbb5aca2c25e37b04828cf0b7d90e2f22af816e" | 16 | SRCREV_meta ?= "3b37e8fd4c88d5d3dce94fc1a80aee49a60a69a8" |
17 | 17 | ||
18 | PR = "${INC_PR}.0" | 18 | PR = "${INC_PR}.0" |
19 | PV = "${LINUX_VERSION}+git${SRCPV}" | 19 | PV = "${LINUX_VERSION}+git${SRCPV}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb index 62eb4be70d..05ca1cc10e 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb | |||
@@ -3,17 +3,17 @@ require recipes-kernel/linux/linux-yocto.inc | |||
3 | KBRANCH_DEFAULT = "standard/base" | 3 | KBRANCH_DEFAULT = "standard/base" |
4 | KBRANCH = "${KBRANCH_DEFAULT}" | 4 | KBRANCH = "${KBRANCH_DEFAULT}" |
5 | 5 | ||
6 | SRCREV_machine_qemuarm ?= "2ed05c280920e592f62d09bda15ab006baffa996" | 6 | SRCREV_machine_qemuarm ?= "b5a80c6a46604d7636c18a3e1ad362d1e6ed234e" |
7 | SRCREV_machine_qemumips ?= "81ef4ad8f02c979a236a460c6831dcb4fbf2ef3c" | 7 | SRCREV_machine_qemumips ?= "66bc662b2cd469a9807fbe838069d3f85cb01bd9" |
8 | SRCREV_machine_qemuppc ?= "6b5d5a60ca6c3cf05d28c9ad447c133563340232" | 8 | SRCREV_machine_qemuppc ?= "d771422df10af41ee61598f4aa06e3c3a018c323" |
9 | SRCREV_machine_qemux86 ?= "7146d001a5f95068a3e2da23a8b3d15aeb20087a" | 9 | SRCREV_machine_qemux86 ?= "59c2a9eb334c2def405c9d93ed6d8d4e822d1945" |
10 | SRCREV_machine_qemux86-64 ?= "7146d001a5f95068a3e2da23a8b3d15aeb20087a" | 10 | SRCREV_machine_qemux86-64 ?= "59c2a9eb334c2def405c9d93ed6d8d4e822d1945" |
11 | SRCREV_machine ?= "7146d001a5f95068a3e2da23a8b3d15aeb20087a" | 11 | SRCREV_machine ?= "59c2a9eb334c2def405c9d93ed6d8d4e822d1945" |
12 | SRCREV_meta ?= "2cbb5aca2c25e37b04828cf0b7d90e2f22af816e" | 12 | SRCREV_meta ?= "3b37e8fd4c88d5d3dce94fc1a80aee49a60a69a8" |
13 | 13 | ||
14 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" | 14 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" |
15 | 15 | ||
16 | LINUX_VERSION ?= "3.4.24" | 16 | LINUX_VERSION ?= "3.4.26" |
17 | 17 | ||
18 | PR = "${INC_PR}.3" | 18 | PR = "${INC_PR}.3" |
19 | PV = "${LINUX_VERSION}+git${SRCPV}" | 19 | PV = "${LINUX_VERSION}+git${SRCPV}" |