summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-01-07 10:43:03 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-07 19:25:19 +0000
commit88856144bf97630f4c43fd7c984343caf287a435 (patch)
tree109628585120e434582bfbadda8af7be69d0dd64 /meta
parent928f03017886eb5f4869c559de3d61351fe801a3 (diff)
downloadopenembedded-core-contrib-88856144bf97630f4c43fd7c984343caf287a435.tar.gz
linux-yocto/3.4: integrate v3.4.21, v3.4.22, v3.4.23
Updating the SRCREVs to integrate the korg -stable updates. 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 6412edcd47..c3f3c4fc98 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.20"
+LINUX_VERSION ?= "3.4.23"
LINUX_KERNEL_TYPE = "preempt-rt"
KMETA = "meta"
-SRCREV_machine ?= "61a6e7a812b3b49988c4eb29a78c5db94d380197"
-SRCREV_machine_qemuppc ?= "0d29fe9056288412b8b538e48af3c78bac3494f1"
-SRCREV_meta ?= "6737e890fff2a423fbb022ab1f7f82ef187fd8b1"
+SRCREV_machine ?= "14f4a06b2275a9b23c5a5e50da687d4218227981"
+SRCREV_machine_qemuppc ?= "ebcf52db41ea59f6dfb8824cf214eb2ed0318dac"
+SRCREV_meta ?= "6d4cb3c86cde2f37ea1d67933a1d24e45920753c"
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 a18a561826..62fb184cfc 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.20"
+LINUX_VERSION ?= "3.4.23"
KMETA = "meta"
-SRCREV_machine ?= "b13bef6377719a488293af196236cc290566fad3"
-SRCREV_meta ?= "6737e890fff2a423fbb022ab1f7f82ef187fd8b1"
+SRCREV_machine ?= "782622711662dc3676040f085f589d10780a1e33"
+SRCREV_meta ?= "6d4cb3c86cde2f37ea1d67933a1d24e45920753c"
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 91785f9089..ace0b7f28b 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 ?= "092d66e326abfda80c50dcf1869417d7420847f1"
-SRCREV_machine_qemumips ?= "b258437665477f44a868c38c6c9cc5199db58cd8"
-SRCREV_machine_qemuppc ?= "67a370223d695ec08b6e5a38860fa1fe5d0d9f1e"
-SRCREV_machine_qemux86 ?= "b13bef6377719a488293af196236cc290566fad3"
-SRCREV_machine_qemux86-64 ?= "b13bef6377719a488293af196236cc290566fad3"
-SRCREV_machine ?= "b13bef6377719a488293af196236cc290566fad3"
-SRCREV_meta ?= "6737e890fff2a423fbb022ab1f7f82ef187fd8b1"
+SRCREV_machine_qemuarm ?= "c1e1ed0f4ab5f90f11f49d4d1aa79b378a14708f"
+SRCREV_machine_qemumips ?= "d6138383ef03c70e3580beffe318e6a2f1a2767e"
+SRCREV_machine_qemuppc ?= "9ef6eddfeeb8e5cda01c008c4fa49629902561de"
+SRCREV_machine_qemux86 ?= "782622711662dc3676040f085f589d10780a1e33"
+SRCREV_machine_qemux86-64 ?= "782622711662dc3676040f085f589d10780a1e33"
+SRCREV_machine ?= "782622711662dc3676040f085f589d10780a1e33"
+SRCREV_meta ?= "6d4cb3c86cde2f37ea1d67933a1d24e45920753c"
SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta"
-LINUX_VERSION ?= "3.4.20"
+LINUX_VERSION ?= "3.4.23"
PR = "${INC_PR}.3"
PV = "${LINUX_VERSION}+git${SRCPV}"