summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux/linux-yocto_3.4.bb
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-11-30 12:33:50 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 12:31:11 +0000
commit48e7c26824e6f6a18f451aa34f7c30372a82f534 (patch)
tree6967a91b125420e6b1b0cb5cd466505b524cc722 /meta/recipes-kernel/linux/linux-yocto_3.4.bb
parent2907c80bf1be8be6866346c0c0615ec0dd459c44 (diff)
downloadpoky-48e7c26824e6f6a18f451aa34f7c30372a82f534.tar.gz
linux-yocto/3.4: merge v3.4.19, v3.4.20
Updating the linux-yocto-3.4 trees to incorporate both 3.4.19 and 3.4.20 from the kernel.org -stable team. (From OE-Core rev: 8ac0c82bb8fe4fe17b6a32b18e57546d21b4d5ef) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux/linux-yocto_3.4.bb')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.4.bb16
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index bb3c860bf3..814492da99 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
3KBRANCH_DEFAULT = "standard/base" 3KBRANCH_DEFAULT = "standard/base"
4KBRANCH = "${KBRANCH_DEFAULT}" 4KBRANCH = "${KBRANCH_DEFAULT}"
5 5
6SRCREV_machine_qemuarm ?= "e24986bf7398f5fb471173bda1d4f32008da101a" 6SRCREV_machine_qemuarm ?= "092d66e326abfda80c50dcf1869417d7420847f1"
7SRCREV_machine_qemumips ?= "8835a2ba0d8e8f9bb5e2513d3568ae3970acefd5" 7SRCREV_machine_qemumips ?= "b258437665477f44a868c38c6c9cc5199db58cd8"
8SRCREV_machine_qemuppc ?= "ae8e2cd14e47bceb9c2bdcb927b3a0ea61f6c311" 8SRCREV_machine_qemuppc ?= "67a370223d695ec08b6e5a38860fa1fe5d0d9f1e"
9SRCREV_machine_qemux86 ?= "f1c2320544eaffd6ecc7fcb8b18f8a0ed4ba2e14" 9SRCREV_machine_qemux86 ?= "b13bef6377719a488293af196236cc290566fad3"
10SRCREV_machine_qemux86-64 ?= "f1c2320544eaffd6ecc7fcb8b18f8a0ed4ba2e14" 10SRCREV_machine_qemux86-64 ?= "b13bef6377719a488293af196236cc290566fad3"
11SRCREV_machine ?= "f1c2320544eaffd6ecc7fcb8b18f8a0ed4ba2e14" 11SRCREV_machine ?= "b13bef6377719a488293af196236cc290566fad3"
12SRCREV_meta ?= "4e5f2b43acfbdb924edbdf42a816e3e2b15203b3" 12SRCREV_meta ?= "8b0a93c0a224c9b91f90545b123b055b2e313bfc"
13 13
14SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" 14SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
15 15
16LINUX_VERSION ?= "3.4.18" 16LINUX_VERSION ?= "3.4.20"
17 17
18PR = "${INC_PR}.3" 18PR = "${INC_PR}.3"
19PV = "${LINUX_VERSION}+git${SRCPV}" 19PV = "${LINUX_VERSION}+git${SRCPV}"