summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-06-07 15:59:43 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-21 11:59:34 +0100
commit5f2b526109087a96cdfd2e42081f7931f61324ec (patch)
treef55a4220488d419105a55c8b09b1c2fdfc4fbbc5
parent6bb0fdda409de696a1a15e1830ac3a8057ac9a95 (diff)
downloadpoky-5f2b526109087a96cdfd2e42081f7931f61324ec.tar.gz
linux-yocto/3.2: update to v3.2.18
Updating the 3.2 kernel SRCREVs to pickup the -stable update to v3.2.18. (From OE-Core rev: 0308f91b17b052902a01c98afdd5619cd0c617e5) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Reworked commit to fix merge conflicts with denzil branch. Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.2.bb16
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
index 21cd84dc95..690d3e9780 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
@@ -11,11 +11,11 @@ KMACHINE_qemumips = "mti-malta32-be"
11KBRANCH = "standard/preempt-rt/base" 11KBRANCH = "standard/preempt-rt/base"
12KBRANCH_qemuppc = "standard/preempt-rt/qemu-ppc32" 12KBRANCH_qemuppc = "standard/preempt-rt/qemu-ppc32"
13 13
14LINUX_VERSION ?= "3.2.11" 14LINUX_VERSION ?= "3.2.18"
15LINUX_KERNEL_TYPE = "preempt-rt" 15LINUX_KERNEL_TYPE = "preempt-rt"
16 16
17SRCREV_machine ?= "3ebf4d172cf4a41d2abf09e4036f0850e08064e7" 17SRCREV_machine ?= "fe2630b38159ea7b9cf977b5fed40a9917002087"
18SRCREV_machine_qemuppc ?= "7cebfe717987f4ffa9ae90558c28f45049847c1c" 18SRCREV_machine_qemuppc ?= "0259e5a3ef568c6979f2cb31280a43c55c784f4f"
19SRCREV_meta ?= "49f931bc294d5b6be60502bbd448cff5aa766235" 19SRCREV_meta ?= "49f931bc294d5b6be60502bbd448cff5aa766235"
20 20
21PR = "r1" 21PR = "r1"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb
index f50e12e491..80be112ac3 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb
@@ -9,9 +9,9 @@ KBRANCH = "standard/tiny"
9LINUX_KERNEL_TYPE = "tiny" 9LINUX_KERNEL_TYPE = "tiny"
10KCONFIG_MODE = "--allnoconfig" 10KCONFIG_MODE = "--allnoconfig"
11 11
12LINUX_VERSION ?= "3.2.11" 12LINUX_VERSION ?= "3.2.18"
13 13
14SRCREV_machine ?= "61960ba8e910d54b5525d5e9b6a7469bc399c246" 14SRCREV_machine ?= "8b8cfaaab2b8d79ac56e8c9a85bad9ae7bca399c"
15SRCREV_meta ?= "49f931bc294d5b6be60502bbd448cff5aa766235" 15SRCREV_meta ?= "49f931bc294d5b6be60502bbd448cff5aa766235"
16 16
17PR = "r0" 17PR = "r0"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.2.bb b/meta/recipes-kernel/linux/linux-yocto_3.2.bb
index c228794d4d..edffec994e 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.2.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.2.bb
@@ -15,14 +15,14 @@ KBRANCH_qemuppc = "standard/default/qemu-ppc32"
15KBRANCH_qemumips = "standard/default/mti-malta32-be" 15KBRANCH_qemumips = "standard/default/mti-malta32-be"
16KBRANCH_qemuarm = "standard/default/arm-versatile-926ejs" 16KBRANCH_qemuarm = "standard/default/arm-versatile-926ejs"
17 17
18LINUX_VERSION ?= "3.2.11" 18LINUX_VERSION ?= "3.2.18"
19 19
20SRCREV_machine_qemuarm ?= "ba47a1cc9bb6ad576b2ac7adb3036bcfa569fe2e" 20SRCREV_machine_qemuarm ?= "259cff0813417d16baaaaf44b00a9f75103ebfcb"
21SRCREV_machine_qemumips ?= "3b2fd654392a2f33aed12748548c04e9b169591b" 21SRCREV_machine_qemumips ?= "9a803ecc05b3af481036a6d9bb0da3a899be3074"
22SRCREV_machine_qemuppc ?= "cf3e188cf2a18c48a0e6f9ca54c36e6ac39512ec" 22SRCREV_machine_qemuppc ?= "466746d1fe6370957ba087f9ca6f2e31201b2162"
23SRCREV_machine_qemux86 ?= "46f1007ad22b6790224c66a8dc4e80fdbd21eea1" 23SRCREV_machine_qemux86 ?= "c228cadee60f0ada73d11a36f6932f50a1c52d48"
24SRCREV_machine_qemux86-64 ?= "00e5ec2393bada6723bd9a07ded3d001c02fa727" 24SRCREV_machine_qemux86-64 ?= "b95a0ae3773545fa0ed9a47088d0361527c42e6c"
25SRCREV_machine ?= "f4f8ba730e7783e09413872414d0a17c142c816d" 25SRCREV_machine ?= "8b8cfaaab2b8d79ac56e8c9a85bad9ae7bca399c"
26SRCREV_meta ?= "49f931bc294d5b6be60502bbd448cff5aa766235" 26SRCREV_meta ?= "49f931bc294d5b6be60502bbd448cff5aa766235"
27 27
28PR = "r1" 28PR = "r1"