diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2013-01-07 10:43:03 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-01-07 19:26:29 +0000 |
commit | 206ce5743e1a43461f0b86f3b161dd79b10d20a6 (patch) | |
tree | d0d15d61e018edadc1fa072b6e69f34bc346b607 | |
parent | 7d0d6f0944091b610b9273e7e58505035803ffed (diff) | |
download | poky-206ce5743e1a43461f0b86f3b161dd79b10d20a6.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.
(From OE-Core rev: 88856144bf97630f4c43fd7c984343caf287a435)
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 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 | |||
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.20" | 6 | LINUX_VERSION ?= "3.4.23" |
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 ?= "61a6e7a812b3b49988c4eb29a78c5db94d380197" | 11 | SRCREV_machine ?= "14f4a06b2275a9b23c5a5e50da687d4218227981" |
12 | SRCREV_machine_qemuppc ?= "0d29fe9056288412b8b538e48af3c78bac3494f1" | 12 | SRCREV_machine_qemuppc ?= "ebcf52db41ea59f6dfb8824cf214eb2ed0318dac" |
13 | SRCREV_meta ?= "6737e890fff2a423fbb022ab1f7f82ef187fd8b1" | 13 | SRCREV_meta ?= "6d4cb3c86cde2f37ea1d67933a1d24e45920753c" |
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 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}" | |||
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.20" | 11 | LINUX_VERSION ?= "3.4.23" |
12 | 12 | ||
13 | KMETA = "meta" | 13 | KMETA = "meta" |
14 | 14 | ||
15 | SRCREV_machine ?= "b13bef6377719a488293af196236cc290566fad3" | 15 | SRCREV_machine ?= "782622711662dc3676040f085f589d10780a1e33" |
16 | SRCREV_meta ?= "6737e890fff2a423fbb022ab1f7f82ef187fd8b1" | 16 | SRCREV_meta ?= "6d4cb3c86cde2f37ea1d67933a1d24e45920753c" |
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 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 | |||
3 | KBRANCH_DEFAULT = "standard/base" | 3 | KBRANCH_DEFAULT = "standard/base" |
4 | KBRANCH = "${KBRANCH_DEFAULT}" | 4 | KBRANCH = "${KBRANCH_DEFAULT}" |
5 | 5 | ||
6 | SRCREV_machine_qemuarm ?= "092d66e326abfda80c50dcf1869417d7420847f1" | 6 | SRCREV_machine_qemuarm ?= "c1e1ed0f4ab5f90f11f49d4d1aa79b378a14708f" |
7 | SRCREV_machine_qemumips ?= "b258437665477f44a868c38c6c9cc5199db58cd8" | 7 | SRCREV_machine_qemumips ?= "d6138383ef03c70e3580beffe318e6a2f1a2767e" |
8 | SRCREV_machine_qemuppc ?= "67a370223d695ec08b6e5a38860fa1fe5d0d9f1e" | 8 | SRCREV_machine_qemuppc ?= "9ef6eddfeeb8e5cda01c008c4fa49629902561de" |
9 | SRCREV_machine_qemux86 ?= "b13bef6377719a488293af196236cc290566fad3" | 9 | SRCREV_machine_qemux86 ?= "782622711662dc3676040f085f589d10780a1e33" |
10 | SRCREV_machine_qemux86-64 ?= "b13bef6377719a488293af196236cc290566fad3" | 10 | SRCREV_machine_qemux86-64 ?= "782622711662dc3676040f085f589d10780a1e33" |
11 | SRCREV_machine ?= "b13bef6377719a488293af196236cc290566fad3" | 11 | SRCREV_machine ?= "782622711662dc3676040f085f589d10780a1e33" |
12 | SRCREV_meta ?= "6737e890fff2a423fbb022ab1f7f82ef187fd8b1" | 12 | SRCREV_meta ?= "6d4cb3c86cde2f37ea1d67933a1d24e45920753c" |
13 | 13 | ||
14 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta" | 14 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},${KMETA};name=machine,meta" |
15 | 15 | ||
16 | LINUX_VERSION ?= "3.4.20" | 16 | LINUX_VERSION ?= "3.4.23" |
17 | 17 | ||
18 | PR = "${INC_PR}.3" | 18 | PR = "${INC_PR}.3" |
19 | PV = "${LINUX_VERSION}+git${SRCPV}" | 19 | PV = "${LINUX_VERSION}+git${SRCPV}" |