summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2012-11-29 14:07:24 -0200
committerOtavio Salvador <otavio@ossystems.com.br>2012-12-03 09:24:06 -0200
commitdae92870d20861c4bde6e2e725e05b72ac783ab9 (patch)
tree17ac8ab2d009dc357539180971c7fbbe9978c6c3
parenta3227c59eb8b4ddb39b9587ef3f82b954f25de96 (diff)
downloadmeta-fsl-arm-dae92870d20861c4bde6e2e725e05b72ac783ab9.tar.gz
linux-imx (3.0.35): Update SRCREV as perf fix has been merged
Change-Id: I226315eaa399f6448e26908185f535c127ff6e95 Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--recipes-kernel/linux/linux-imx/perf_tools_Fix_build_against_newer_glibc.patch37
-rw-r--r--recipes-kernel/linux/linux-imx_3.0.35.bb6
2 files changed, 2 insertions, 41 deletions
diff --git a/recipes-kernel/linux/linux-imx/perf_tools_Fix_build_against_newer_glibc.patch b/recipes-kernel/linux/linux-imx/perf_tools_Fix_build_against_newer_glibc.patch
deleted file mode 100644
index 9631777..0000000
--- a/recipes-kernel/linux/linux-imx/perf_tools_Fix_build_against_newer_glibc.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From: Josh Boyer <jwboyer@redhat.com>
2Date: Thu, 18 Aug 2011 11:37:21 +0000 (-0400)
3Subject: perf tools: Fix build against newer glibc
4
5perf tools: Fix build against newer glibc
6
7Upstream glibc commit 295e904 added a definition for __attribute_const__
8to cdefs.h. This causes the following error when building perf:
9
10util/include/linux/compiler.h:8:0: error: "__attribute_const__"
11redefined [-Werror] /usr/include/sys/cdefs.h:226:0: note: this is the
12location of the previous definition
13
14Wrap __attribute_const__ in #ifndef as we do for __always_inline.
15
16Cc: Ingo Molnar <mingo@elte.hu>
17Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
18Link: http://lkml.kernel.org/r/20110818113720.GL2227@zod.bos.redhat.com
19Signed-off-by: Josh Boyer <jwboyer@redhat.com>
20Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
21---
22
23diff --git a/tools/perf/util/include/linux/compiler.h b/tools/perf/util/include/linux/compiler.h
24index 791f9dd..547628e 100644
25--- a/tools/perf/util/include/linux/compiler.h
26+++ b/tools/perf/util/include/linux/compiler.h
27@@ -5,7 +5,9 @@
28 #define __always_inline inline
29 #endif
30 #define __user
31+#ifndef __attribute_const__
32 #define __attribute_const__
33+#endif
34
35 #define __used __attribute__((__unused__))
36
37
diff --git a/recipes-kernel/linux/linux-imx_3.0.35.bb b/recipes-kernel/linux/linux-imx_3.0.35.bb
index c183e1e..4aa5f08 100644
--- a/recipes-kernel/linux/linux-imx_3.0.35.bb
+++ b/recipes-kernel/linux/linux-imx_3.0.35.bb
@@ -3,15 +3,13 @@
3 3
4include linux-imx.inc 4include linux-imx.inc
5 5
6PR = "${INC_PR}.4" 6PR = "${INC_PR}.5"
7 7
8COMPATIBLE_MACHINE = "(mx6)" 8COMPATIBLE_MACHINE = "(mx6)"
9 9
10# Revision of 12.09.01 tag 10# Revision of 12.09.01 tag
11SRCREV = "eaaf30efdc8dfeb03418bde1499a76c9903bd211" 11SRCREV = "059685632ebd37a89e60cbb1e6dd535b3b08c3be"
12LOCALVERSION = "-12.09.01+yocto" 12LOCALVERSION = "-12.09.01+yocto"
13 13
14SRC_URI += "file://perf_tools_Fix_build_against_newer_glibc.patch"
15
16# iMX6Q SabreLITE changes done by Boundary Devices 14# iMX6Q SabreLITE changes done by Boundary Devices
17SRC_URI_append_imx6qsabrelite = " file://sync-boundary-changes.patch" 15SRC_URI_append_imx6qsabrelite = " file://sync-boundary-changes.patch"