summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-01-11 13:30:50 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-17 14:53:18 +0000
commit7561d5b204aadeae7103148980149dd24c0eae4f (patch)
tree337cd25cfe639d905b174f945e2865f9f4a3b536 /meta/recipes-kernel/linux
parentbec7def38dfdb63670ae62bf59c2ff9078a58829 (diff)
downloadpoky-7561d5b204aadeae7103148980149dd24c0eae4f.tar.gz
linux-yocto: consolidated fix SRCREV updates
Updating the SRCREVs to include the following fixes from Khem Raj and Zumeng Chen. 6f5b118 compiler.h: Undef before redefining __attribute_const__ fe80c1e oprofile, arm/sh: Fix oprofile_arch_exit() linkage issue (From OE-Core rev: 02e22816d68dc2bac7fed6952e52ea8a3d9532d2) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.0.bb13
2 files changed, 9 insertions, 8 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
index c6bf4465b2..145e54802e 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -14,8 +14,8 @@ KBRANCH_qemuppc = "yocto/standard/preempt-rt/qemu-ppc32"
14LINUX_VERSION ?= "3.0.14" 14LINUX_VERSION ?= "3.0.14"
15LINUX_KERNEL_TYPE = "preempt-rt" 15LINUX_KERNEL_TYPE = "preempt-rt"
16 16
17SRCREV_machine ?= "bcf4107c7f22d10952618a2ad146e6149d240cd2" 17SRCREV_machine ?= "f1cc220f4ddf434bf254707c83a45794a63f117f"
18SRCREV_machine_qemuppc ?= "1e5511ea2cb5f150ffce86071035a81c0499494b" 18SRCREV_machine_qemuppc ?= "8bd5b80cb3243dadc9d6c5c09482c49994dff1a8"
19SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4" 19SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4"
20 20
21PR = "r1" 21PR = "r1"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index e624b48bc2..0b79beec23 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -12,12 +12,13 @@ KBRANCH = ${KMACHINE}
12 12
13LINUX_VERSION ?= "3.0.14" 13LINUX_VERSION ?= "3.0.14"
14 14
15SRCREV_machine_qemuarm ?= "c498cc6e4b56784b3c2c547cb9a7af435b9412c1" 15
16SRCREV_machine_qemumips ?= "791c3f4124a238a798e2360340800f4989fad695" 16SRCREV_machine_qemuarm ?= "c0386e4195c685b0ff94b7e21581ec47008ab13b"
17SRCREV_machine_qemuppc ?= "10e808d1c304b14cf42903fd637f239766b78476" 17SRCREV_machine_qemumips ?= "56e4361a1bfc10042d83a7d8a5f96932056e3f35"
18SRCREV_machine_qemux86 ?= "e04f9f8e564c60b1ce907d64074c18730f8dab4e" 18SRCREV_machine_qemuppc ?= "53e71af30e30162e17e32b2f57e4481f5bc0573e"
19SRCREV_machine_qemux86-64 ?= "53c2fa060d34e9a0b59e19398aeebbe73f24d89b" 19SRCREV_machine_qemux86 ?= "9e73573b6b227ab2c62e66e63470866d136f8d76"
20SRCREV_machine ?= "fe80c1e343bf8f038328a612cef7f821d7ec8dbf" 20SRCREV_machine_qemux86-64 ?= "3551fd0412965b1f6b0b2f6ba35f7fecdaddb58a"
21SRCREV_machine ?= "6f5b11830deba4a6262c8c4abf67e608924f649e"
21SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4" 22SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4"
22 23
23PR = "r2" 24PR = "r2"