summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-03-26 07:46:36 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-26 17:48:57 +0000
commit19d77ddf6c5d7822b757342a4e41ea68403889c3 (patch)
treeb854e46ed4866148868b4e4d4c5d6695e82067d9 /meta
parent65113af811afcf53d3056d372861cd4d1a6bff07 (diff)
downloadopenembedded-core-19d77ddf6c5d7822b757342a4e41ea68403889c3.tar.gz
openembedded-core-19d77ddf6c5d7822b757342a4e41ea68403889c3.tar.bz2
openembedded-core-19d77ddf6c5d7822b757342a4e41ea68403889c3.zip
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. 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.4.bb8
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.4.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.4.bb16
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
KBRANCH = "standard/preempt-rt/base"
KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
-LINUX_VERSION ?= "3.4.34"
+LINUX_VERSION ?= "3.4.36"
LINUX_KERNEL_TYPE = "preempt-rt"
KMETA = "meta"
-SRCREV_machine ?= "96730f882e5b3f60d259ef41ed7c18c95512194a"
-SRCREV_machine_qemuppc ?= "9a013a2a1facf949d9f8cc1b2a291651235c75ea"
-SRCREV_meta ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993"
+SRCREV_machine ?= "7302a8f84da657ff72ca5a27b9212c9d3bee2fbf"
+SRCREV_machine_qemuppc ?= "494b16c51c6f6dc272eb820eaa57028ca8ee9da2"
+SRCREV_meta ?= "80b4b5110dca5184b57e85f1e775fb006a2e85ad"
PR = "${INC_PR}.0"
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}"
LINUX_KERNEL_TYPE = "tiny"
KCONFIG_MODE = "--allnoconfig"
-LINUX_VERSION ?= "3.4.34"
+LINUX_VERSION ?= "3.4.36"
KMETA = "meta"
-SRCREV_machine ?= "840bb8c059418c4753415df56c9aff1c0d5354c8"
-SRCREV_meta ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993"
+SRCREV_machine ?= "c994390cfa28339cbc1ec3b56eeec83a5fa75bb7"
+SRCREV_meta ?= "80b4b5110dca5184b57e85f1e775fb006a2e85ad"
PR = "${INC_PR}.0"
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
KBRANCH_DEFAULT = "standard/base"
KBRANCH = "${KBRANCH_DEFAULT}"
-SRCREV_machine_qemuarm ?= "c7cc288f0113433bd51d4958d36d4ef4bf13c214"
-SRCREV_machine_qemumips ?= "d4f5af54aa6a3592c6b2656ef20ea98bee14fde9"
-SRCREV_machine_qemuppc ?= "8afd98bd2aae1ad86b97d4333107408745518f8d"
-SRCREV_machine_qemux86 ?= "840bb8c059418c4753415df56c9aff1c0d5354c8"
-SRCREV_machine_qemux86-64 ?= "840bb8c059418c4753415df56c9aff1c0d5354c8"
-SRCREV_machine ?= "840bb8c059418c4753415df56c9aff1c0d5354c8"
-SRCREV_meta ?= "4fd76cc4f33e0afd8f906b1e8f231b6d13b6c993"
+SRCREV_machine_qemuarm ?= "7cc80532306889b75619f8a1b713048e25f59e19"
+SRCREV_machine_qemumips ?= "debce6677988e03b50c369aba5861d4f9b2e557d"
+SRCREV_machine_qemuppc ?= "ddbc382cbc45a009e9ce17f7d448fcfd050ab5fc"
+SRCREV_machine_qemux86 ?= "c994390cfa28339cbc1ec3b56eeec83a5fa75bb7"
+SRCREV_machine_qemux86-64 ?= "c994390cfa28339cbc1ec3b56eeec83a5fa75bb7"
+SRCREV_machine ?= "c994390cfa28339cbc1ec3b56eeec83a5fa75bb7"
+SRCREV_meta ?= "80b4b5110dca5184b57e85f1e775fb006a2e85ad"
SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
-LINUX_VERSION ?= "3.4.34"
+LINUX_VERSION ?= "3.4.36"
PR = "${INC_PR}.3"
PV = "${LINUX_VERSION}+git${SRCPV}"