summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-07-23 13:10:24 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-26 14:40:45 +0100
commite7dd47dcdfdba9c34ddab37d0021dc8266d4b2c6 (patch)
treec01566073a6a3793c848a0da6558dd9efaa04ae0 /meta
parent93060b69c761cde73a706d19ba82e59ed0f709a7 (diff)
downloadpoky-e7dd47dcdfdba9c34ddab37d0021dc8266d4b2c6.tar.gz
linux-yocto/3.4: 3.4.6 and 3.4.x-rt14
Updating the 3.4 kernel to the latest -stable release and updating preempt-rt to 3.4.4-rt14. Tested on qemu* (From OE-Core rev: 955fd1408713634d9a96b00ef53ed0a6a188e9fe) 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')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb8
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.4.bb16
2 files changed, 12 insertions, 12 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 97a1a19530..3e7952ddf3 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
3KBRANCH = "standard/preempt-rt/base" 3KBRANCH = "standard/preempt-rt/base"
4KBRANCH_qemuppc = "standard/preempt-rt/qemuppc" 4KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
5 5
6LINUX_VERSION ?= "3.4.4" 6LINUX_VERSION ?= "3.4.6"
7LINUX_KERNEL_TYPE = "preempt-rt" 7LINUX_KERNEL_TYPE = "preempt-rt"
8 8
9KMETA = "meta" 9KMETA = "meta"
10 10
11SRCREV_machine ?= "b25f7c9730e3bd3be1bf7b7982251b7459ad6579" 11SRCREV_machine ?= "2d008a6dcbf565878cee14c5f050eca53897316f"
12SRCREV_machine_qemuppc ?= "2777125ab6f92b624ecaf11d6b1ab604e64497a8" 12SRCREV_machine_qemuppc ?= "94d25f958b6dfb1e8009a0feea7ab4c9a8f54a99"
13SRCREV_meta ?= "949fddda61053cc15e46c015e8f7db17e7b33360" 13SRCREV_meta ?= "d7a96809a585e06933d8c08adb9b9f66b21efb4c"
14 14
15PR = "${INC_PR}.0" 15PR = "${INC_PR}.0"
16PV = "${LINUX_VERSION}+git${SRCPV}" 16PV = "${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 f031e1b668..f3867f7081 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -10,17 +10,17 @@ KBRANCH_qemumips64 = "standard/mti-malta64"
10KBRANCH_qemumips64el = "standard/mti-malta64" 10KBRANCH_qemumips64el = "standard/mti-malta64"
11KBRANCH_qemuarm = "standard/arm-versatile-926ejs" 11KBRANCH_qemuarm = "standard/arm-versatile-926ejs"
12 12
13SRCREV_machine_qemuarm ?= "9aca8fec49787efbe44d0f137f31ee59edd94c49" 13SRCREV_machine_qemuarm ?= "b57548a29e44655e27cfbdf3a0642d682401b835"
14SRCREV_machine_qemumips ?= "23fa942849b1207dbfc4528e2a5c8df0fd71870c" 14SRCREV_machine_qemumips ?= "633d487b0f6e5d328400b47f0d69d9dac7354c84"
15SRCREV_machine_qemuppc ?= "08732f25bc3cb404e29ae201074bcf5c1661ea83" 15SRCREV_machine_qemuppc ?= "6229fc0f62283e0dc9f8b5d2be01b048a92867f3"
16SRCREV_machine_qemux86 ?= "6297e4c1d57e1063bfce297c2e12392348598559" 16SRCREV_machine_qemux86 ?= "19f7e43b54aef08d58135ed2a897d77b624b320a"
17SRCREV_machine_qemux86-64 ?= "6297e4c1d57e1063bfce297c2e12392348598559" 17SRCREV_machine_qemux86-64 ?= "19f7e43b54aef08d58135ed2a897d77b624b320a"
18SRCREV_machine ?= "6297e4c1d57e1063bfce297c2e12392348598559" 18SRCREV_machine ?= "19f7e43b54aef08d58135ed2a897d77b624b320a"
19SRCREV_meta ?= "949fddda61053cc15e46c015e8f7db17e7b33360" 19SRCREV_meta ?= "d7a96809a585e06933d8c08adb9b9f66b21efb4c"
20 20
21SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta" 21SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
22 22
23LINUX_VERSION ?= "3.4.4" 23LINUX_VERSION ?= "3.4.6"
24 24
25PR = "${INC_PR}.0" 25PR = "${INC_PR}.0"
26PV = "${LINUX_VERSION}+git${SRCPV}" 26PV = "${LINUX_VERSION}+git${SRCPV}"