From patchwork Mon Jan 28 20:50:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2/2] oprofile: remove AX_KERNEL_VERSION from acinclude.m4 Date: Mon, 28 Jan 2013 20:50:57 -0000 From: tom.zanussi@linux.intel.com X-Patchwork-Id: 43577 Message-Id: <6b7e1009b3a011ffc035f611f28cdedcef0527b4.1359405784.git.tom.zanussi@linux.intel.com> To: openembedded-core@lists.openembedded.org Cc: Tom Zanussi From: Tom Zanussi The version of this macro in acinclude.m4 is preventing the correct version in the package's kernelversion.m4 from being used. Since the version in acinclude.m4 includes the obsolete config.h, any test that uses it with newer (> 2.6.19) kernels fails. In the case of oprofile it means that perf_events support is never detected and thus 'legacy oprofile' is always built. Fixing this allows the new perf_events 'operf' support to be built. Fixes [YOCTO #3447] Signed-off-by: Tom Zanussi --- meta/recipes-kernel/oprofile/oprofile.inc | 2 +- meta/recipes-kernel/oprofile/oprofile/acinclude.m4 | 19 ------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/meta/recipes-kernel/oprofile/oprofile.inc b/meta/recipes-kernel/oprofile/oprofile.inc index d6d20ae..c275110 100644 --- a/meta/recipes-kernel/oprofile/oprofile.inc +++ b/meta/recipes-kernel/oprofile/oprofile.inc @@ -19,7 +19,7 @@ FILES_${PN} = "${bindir} ${libdir}/${BPN}/lib*${SOLIBS} ${datadir}/${BPN}" FILES_${PN}-dev += "${libdir}/${BPN}/lib*${SOLIBSDEV} ${libdir}/${BPN}/lib*.la" FILES_${PN}-staticdev += "${libdir}/${BPN}/lib*.a" -INC_PR = "r1" +INC_PR = "r2" SRC_URI = "file://opstart.patch \ file://oprofile-no-query-modules.patch \ diff --git a/meta/recipes-kernel/oprofile/oprofile/acinclude.m4 b/meta/recipes-kernel/oprofile/oprofile/acinclude.m4 index ffaa828..95ecd91 100644 --- a/meta/recipes-kernel/oprofile/oprofile/acinclude.m4 +++ b/meta/recipes-kernel/oprofile/oprofile/acinclude.m4 @@ -104,25 +104,6 @@ AC_SUBST(OPROFILE_MODULE_ARCH) ] ) -dnl AX_KERNEL_VERSION(major, minor, level, comparison, action-if-true, action-if-false) -AC_DEFUN([AX_KERNEL_VERSION], [ -SAVE_CFLAGS=$CFLAGS -CFLAGS="-I$KINC -D__KERNEL__ -Werror" -AC_TRY_COMPILE( - [ - #include - #include - ], - [ - #if LINUX_VERSION_CODE $4 KERNEL_VERSION($1, $2, $3) - break_me_hard(\\\); - #endif - ], -[$5],[$6],) -CFLAGS=$SAVE_CFLAGS -]) - - dnl AX_MSG_RESULT_YN(a) dnl results "yes" iff a==1, "no" else AC_DEFUN([AX_MSG_RESULT_YN], [x=no