[oe-commits] Matthew McClintock : perf_3.4.bb: update to build against older kernels

git at git.openembedded.org git at git.openembedded.org
Sun Aug 19 09:50:49 UTC 2012


Module: openembedded-core.git
Branch: master
Commit: 70b17a893bd2e1bbba8ea16619b02a60e7c4b8d8
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=70b17a893bd2e1bbba8ea16619b02a60e7c4b8d8

Author: Matthew McClintock <msm at freescale.com>
Date:   Thu Aug 16 21:54:56 2012 -0500

perf_3.4.bb: update to build against older kernels

Removes a make install-python_ext when not present since
older versions of perf lack this install rule

This also fixes a library issue on older kernels building with
a newer toolchain where libaries that would previously be pulled
in are no longer. So we add them manually.

Signed-off-by: Matthew McClintock <msm at freescale.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-kernel/perf/perf_3.4.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-kernel/perf/perf_3.4.bb b/meta/recipes-kernel/perf/perf_3.4.bb
index 505c7b8..5fb38e6 100644
--- a/meta/recipes-kernel/perf/perf_3.4.bb
+++ b/meta/recipes-kernel/perf/perf_3.4.bb
@@ -54,6 +54,7 @@ B = "${WORKDIR}/${BPN}-${PV}"
 SCRIPTING_DEFINES = "${@perf_feature_enabled('perf-scripting', '', 'NO_LIBPERL=1 NO_LIBPYTHON=1',d)}"
 TUI_DEFINES = "${@perf_feature_enabled('perf-tui', '', 'NO_NEWT=1',d)}"
 
+export LDFLAGS = "-ldl -lutil"
 EXTRA_OEMAKE = \
 		'-C ${S}/tools/perf \
 		O=${B} \
@@ -71,7 +72,8 @@ do_compile() {
 
 do_install() {
 	oe_runmake DESTDIR=${D} install
-	if [ "${@perf_feature_enabled('perf-scripting', 1, 0, d)}" = "1" ]; then
+	# we are checking for this make target to be compatible with older perf versions
+	if [ "${@perf_feature_enabled('perf-scripting', 1, 0, d)}" = "1" -a $(grep install-python_ext ${S}/tools/perf/Makefile) = "0"]; then
 		oe_runmake DESTDIR=${D} install-python_ext
 	fi
 }





More information about the Openembedded-commits mailing list