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

login
register
mail settings
Submitter Matthew McClintock
Date Aug. 17, 2012, 2:54 a.m.
Message ID <1345172096-10260-1-git-send-email-msm@freescale.com>
Download mbox | patch
Permalink /patch/34767/
State Accepted
Commit 70b17a893bd2e1bbba8ea16619b02a60e7c4b8d8
Headers show

Comments

Matthew McClintock - Aug. 17, 2012, 2:54 a.m.
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@freescale.com>
---
 meta/recipes-kernel/perf/perf_3.4.bb |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Saul Wold - Aug. 20, 2012, 4:57 p.m.
On 08/16/2012 07:54 PM, Matthew McClintock wrote:
> 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@freescale.com>
> ---
>   meta/recipes-kernel/perf/perf_3.4.bb |    4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
>
> 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
>   }
>

Merged into OE-Core

Thanks
	Sau!

Patch

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
 }