]> code.ossystems Code Review - meta-freescale.git/commitdiff
linux-imx (3.0.35): Update SRCREV as perf fix has been merged
authorOtavio Salvador <otavio@ossystems.com.br>
Thu, 29 Nov 2012 16:07:24 +0000 (14:07 -0200)
committerOtavio Salvador <otavio@ossystems.com.br>
Mon, 3 Dec 2012 11:24:06 +0000 (09:24 -0200)
Change-Id: I226315eaa399f6448e26908185f535c127ff6e95
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
meta-fsl-arm/recipes-kernel/linux/linux-imx/perf_tools_Fix_build_against_newer_glibc.patch [deleted file]
meta-fsl-arm/recipes-kernel/linux/linux-imx_3.0.35.bb

diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx/perf_tools_Fix_build_against_newer_glibc.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx/perf_tools_Fix_build_against_newer_glibc.patch
deleted file mode 100644 (file)
index 9631777..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Josh Boyer <jwboyer@redhat.com>
-Date: Thu, 18 Aug 2011 11:37:21 +0000 (-0400)
-Subject: perf tools: Fix build against newer glibc
-
-perf tools: Fix build against newer glibc
-
-Upstream glibc commit 295e904 added a definition for __attribute_const__
-to cdefs.h.  This causes the following error when building perf:
-
-util/include/linux/compiler.h:8:0: error: "__attribute_const__"
-redefined [-Werror] /usr/include/sys/cdefs.h:226:0: note: this is the
-location of the previous definition
-
-Wrap __attribute_const__ in #ifndef as we do for __always_inline.
-
-Cc: Ingo Molnar <mingo@elte.hu>
-Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
-Link: http://lkml.kernel.org/r/20110818113720.GL2227@zod.bos.redhat.com
-Signed-off-by: Josh Boyer <jwboyer@redhat.com>
-Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
----
-
-diff --git a/tools/perf/util/include/linux/compiler.h b/tools/perf/util/include/linux/compiler.h
-index 791f9dd..547628e 100644
---- a/tools/perf/util/include/linux/compiler.h
-+++ b/tools/perf/util/include/linux/compiler.h
-@@ -5,7 +5,9 @@
- #define __always_inline       inline
- #endif
- #define __user
-+#ifndef __attribute_const__
- #define __attribute_const__
-+#endif
- #define __used                __attribute__((__unused__))
-
index c183e1ee452338641a01025a7e3270d9009d2fab..4aa5f08777f347c9cfec41125ffeb82d795770e0 100644 (file)
@@ -3,15 +3,13 @@
 
 include linux-imx.inc
 
-PR = "${INC_PR}.4"
+PR = "${INC_PR}.5"
 
 COMPATIBLE_MACHINE = "(mx6)"
 
 # Revision of 12.09.01 tag
-SRCREV = "eaaf30efdc8dfeb03418bde1499a76c9903bd211"
+SRCREV = "059685632ebd37a89e60cbb1e6dd535b3b08c3be"
 LOCALVERSION = "-12.09.01+yocto"
 
-SRC_URI += "file://perf_tools_Fix_build_against_newer_glibc.patch"
-
 # iMX6Q SabreLITE changes done by Boundary Devices
 SRC_URI_append_imx6qsabrelite = " file://sync-boundary-changes.patch"