diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-03-26 07:46:36 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-26 17:50:09 +0000 |
commit | 16c25604211eb778af38a6436df982e58fb91599 (patch) | |
tree | 983a2a157e5b9a35908e22162b0721d7bbe0e14c | |
parent | 0a81ed273755bade5a2e3f482b8716346184369a (diff) | |
download | poky-16c25604211eb778af38a6436df982e58fb91599.tar.gz |
linux-yocto/3.4: import v3.4.36 -stable fixes
Updating the 3.4 tree to import the korg -stable fixes for v3.4.36.
(From OE-Core rev: 19d77ddf6c5d7822b757342a4e41ea68403889c3)
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 65ebc460ad..42339a1a1f 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.34" | 6 | LINUX_VERSION ?= "3.4.36" |
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 ?= "96730f882e5b3f60d259ef41ed7c18c95512194a" | 11 | SRCREV_machine ?= "7302a8f84da657ff72ca5a27b9212c9d3bee2fbf" |
12 | SRCREV_machine_qemuppc ?= "9a013a2a1facf949d9f8cc1b2a291651235c75ea" | 12 | SRCREV_machine_qemuppc ?= "494b16c51c6f6dc272eb820eaa57028ca8ee9da2" |
13 | SRCREV_meta ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993" | 13 | SRCREV_meta ?= "80b4b5110dca5184b57e85f1e775fb006a2e85ad" |
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 6c37b5764a..4b6b4a015e 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.34" | 11 | LINUX_VERSION ?= "3.4.36" |
12 | 12 | ||
13 | KMETA = "meta" | 13 | KMETA = "meta" |
14 | 14 | ||
15 | SRCREV_machine ?= "840bb8c059418c4753415df56c9aff1c0d5354c8" | 15 | SRCREV_machine ?= "c994390cfa28339cbc1ec3b56eeec83a5fa75bb7" |
16 | SRCREV_meta ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993" | 16 | SRCREV_meta ?= "80b4b5110dca5184b57e85f1e775fb006a2e85ad" |
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 702008c4e9..604aa48f90 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 ?= "c7cc288f0113433bd51d4958d36d4ef4bf13c214" | 6 | SRCREV_machine_qemuarm ?= "7cc80532306889b75619f8a1b713048e25f59e19" |
7 | SRCREV_machine_qemumips ?= "d4f5af54aa6a3592c6b2656ef20ea98bee14fde9" | 7 | SRCREV_machine_qemumips ?= "debce6677988e03b50c369aba5861d4f9b2e557d" |
8 | SRCREV_machine_qemuppc ?= "8afd98bd2aae1ad86b97d4333107408745518f8d" | 8 | SRCREV_machine_qemuppc ?= "ddbc382cbc45a009e9ce17f7d448fcfd050ab5fc" |
9 | SRCREV_machine_qemux86 ?= "840bb8c059418c4753415df56c9aff1c0d5354c8" | 9 | SRCREV_machine_qemux86 ?= "c994390cfa28339cbc1ec3b56eeec83a5fa75bb7" |
10 | SRCREV_machine_qemux86-64 ?= "840bb8c059418c4753415df56c9aff1c0d5354c8" | 10 | SRCREV_machine_qemux86-64 ?= "c994390cfa28339cbc1ec3b56eeec83a5fa75bb7" |
11 | SRCREV_machine ?= "840bb8c059418c4753415df56c9aff1c0d5354c8" | 11 | SRCREV_machine ?= "c994390cfa28339cbc1ec3b56eeec83a5fa75bb7" |
12 | SRCREV_meta ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993" | 12 | SRCREV_meta ?= "80b4b5110dca5184b57e85f1e775fb006a2e85ad" |
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.34" | 16 | LINUX_VERSION ?= "3.4.36" |
17 | 17 | ||
18 | PR = "${INC_PR}.3" | 18 | PR = "${INC_PR}.3" |
19 | PV = "${LINUX_VERSION}+git${SRCPV}" | 19 | PV = "${LINUX_VERSION}+git${SRCPV}" |