From 5f2b526109087a96cdfd2e42081f7931f61324ec Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 7 Jun 2012 15:59:43 -0400 Subject: 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 Signed-off-by: Richard Purdie Reworked commit to fix merge conflicts with denzil branch. Signed-off-by: Scott Garman Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_3.2.bb | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'meta/recipes-kernel') 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" KBRANCH = "standard/preempt-rt/base" KBRANCH_qemuppc = "standard/preempt-rt/qemu-ppc32" -LINUX_VERSION ?= "3.2.11" +LINUX_VERSION ?= "3.2.18" LINUX_KERNEL_TYPE = "preempt-rt" -SRCREV_machine ?= "3ebf4d172cf4a41d2abf09e4036f0850e08064e7" -SRCREV_machine_qemuppc ?= "7cebfe717987f4ffa9ae90558c28f45049847c1c" +SRCREV_machine ?= "fe2630b38159ea7b9cf977b5fed40a9917002087" +SRCREV_machine_qemuppc ?= "0259e5a3ef568c6979f2cb31280a43c55c784f4f" SRCREV_meta ?= "49f931bc294d5b6be60502bbd448cff5aa766235" PR = "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" LINUX_KERNEL_TYPE = "tiny" KCONFIG_MODE = "--allnoconfig" -LINUX_VERSION ?= "3.2.11" +LINUX_VERSION ?= "3.2.18" -SRCREV_machine ?= "61960ba8e910d54b5525d5e9b6a7469bc399c246" +SRCREV_machine ?= "8b8cfaaab2b8d79ac56e8c9a85bad9ae7bca399c" SRCREV_meta ?= "49f931bc294d5b6be60502bbd448cff5aa766235" PR = "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" KBRANCH_qemumips = "standard/default/mti-malta32-be" KBRANCH_qemuarm = "standard/default/arm-versatile-926ejs" -LINUX_VERSION ?= "3.2.11" - -SRCREV_machine_qemuarm ?= "ba47a1cc9bb6ad576b2ac7adb3036bcfa569fe2e" -SRCREV_machine_qemumips ?= "3b2fd654392a2f33aed12748548c04e9b169591b" -SRCREV_machine_qemuppc ?= "cf3e188cf2a18c48a0e6f9ca54c36e6ac39512ec" -SRCREV_machine_qemux86 ?= "46f1007ad22b6790224c66a8dc4e80fdbd21eea1" -SRCREV_machine_qemux86-64 ?= "00e5ec2393bada6723bd9a07ded3d001c02fa727" -SRCREV_machine ?= "f4f8ba730e7783e09413872414d0a17c142c816d" +LINUX_VERSION ?= "3.2.18" + +SRCREV_machine_qemuarm ?= "259cff0813417d16baaaaf44b00a9f75103ebfcb" +SRCREV_machine_qemumips ?= "9a803ecc05b3af481036a6d9bb0da3a899be3074" +SRCREV_machine_qemuppc ?= "466746d1fe6370957ba087f9ca6f2e31201b2162" +SRCREV_machine_qemux86 ?= "c228cadee60f0ada73d11a36f6932f50a1c52d48" +SRCREV_machine_qemux86-64 ?= "b95a0ae3773545fa0ed9a47088d0361527c42e6c" +SRCREV_machine ?= "8b8cfaaab2b8d79ac56e8c9a85bad9ae7bca399c" SRCREV_meta ?= "49f931bc294d5b6be60502bbd448cff5aa766235" PR = "r1" -- cgit v1.2.3-54-g00ecf