[daisy][PATCH 1/2] perf: explicitly disable libunwind

[daisy][PATCH 1/2] perf: explicitly disable libunwind

[Martin Jansa]

* it's not included in DEPENDS and it's detected from sysroot

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-kernel/perf/perf.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 20968f9..9776943 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -76,7 +76,7 @@ EXTRA_OEMAKE = \
 		CC="${CC}" \
 		AR="${AR}" \
 		perfexecdir=${libexecdir} \
-		NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${SCRIPTING_DEFINES} \
+		NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 NO_LIBUNWIND=1 ${SCRIPTING_DEFINES} \
 		'
 
 EXTRA_OEMAKE += "\
-- 
2.0.4

[daisy][PATCH 2/2] perf: fix indentation

[Martin Jansa]

* multiline variables should use spaces not tabs for indentation

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-kernel/perf/perf.bb | 54 ++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 9776943..71e2b28 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -22,13 +22,13 @@ TUI_DEPENDS = "${@perf_feature_enabled('perf-tui', 'libnewt slang', '',d)}"
 SCRIPTING_DEPENDS = "${@perf_feature_enabled('perf-scripting', 'perl python', '',d)}"
 
 DEPENDS = "virtual/kernel \
-           virtual/${MLPREFIX}libc \
-           ${MLPREFIX}elfutils \
-           ${MLPREFIX}binutils \
-           ${TUI_DEPENDS} \
-           ${SCRIPTING_DEPENDS} \
-           bison flex \
-          "
+    virtual/${MLPREFIX}libc \
+    ${MLPREFIX}elfutils \
+    ${MLPREFIX}binutils \
+    ${TUI_DEPENDS} \
+    ${SCRIPTING_DEPENDS} \
+    bison flex \
+"
 
 PROVIDES = "virtual/perf"
 
@@ -68,28 +68,28 @@ TUI_DEFINES = "${@perf_feature_enabled('perf-tui', '', 'NO_NEWT=1',d)}"
 # supported kernel.
 LDFLAGS="-ldl -lutil"
 
-EXTRA_OEMAKE = \
-		'-C ${S}/tools/perf \
-		O=${B} \
-		CROSS_COMPILE=${TARGET_PREFIX} \
-		ARCH=${ARCH} \
-		CC="${CC}" \
-		AR="${AR}" \
-		perfexecdir=${libexecdir} \
-		NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 NO_LIBUNWIND=1 ${SCRIPTING_DEFINES} \
-		'
+EXTRA_OEMAKE = '\
+    -C ${S}/tools/perf \
+    O=${B} \
+    CROSS_COMPILE=${TARGET_PREFIX} \
+    ARCH=${ARCH} \
+    CC="${CC}" \
+    AR="${AR}" \
+    perfexecdir=${libexecdir} \
+    NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 NO_LIBUNWIND=1 ${SCRIPTING_DEFINES} \
+'
 
 EXTRA_OEMAKE += "\
-	'prefix=${prefix}' \
-	'bindir=${bindir}' \
-	'sharedir=${datadir}' \
-	'sysconfdir=${sysconfdir}' \
-	'perfexecdir=${libexecdir}/perf-core' \
-	\
-	'ETC_PERFCONFIG=${@os.path.relpath(sysconfdir, prefix)}' \
-	'sharedir=${@os.path.relpath(datadir, prefix)}' \
-	'mandir=${@os.path.relpath(mandir, prefix)}' \
-	'infodir=${@os.path.relpath(infodir, prefix)}' \
+    'prefix=${prefix}' \
+    'bindir=${bindir}' \
+    'sharedir=${datadir}' \
+    'sysconfdir=${sysconfdir}' \
+    'perfexecdir=${libexecdir}/perf-core' \
+    \
+    'ETC_PERFCONFIG=${@os.path.relpath(sysconfdir, prefix)}' \
+    'sharedir=${@os.path.relpath(datadir, prefix)}' \
+    'mandir=${@os.path.relpath(mandir, prefix)}' \
+    'infodir=${@os.path.relpath(infodir, prefix)}' \
 "
 
 # PPC64 uses long long for u64 in the kernel, but powerpc's asm/types.h
-- 
2.0.4

Re: [daisy][PATCH 1/2] perf: explicitly disable libunwind

[akuster]

On 08/10/2014 02:38 AM, Martin Jansa wrote:
> * it's not included in DEPENDS and it's detected from sysroot
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

Acked-by: Armin Kuster <akuster808@gmail.com>

> ---
>   meta/recipes-kernel/perf/perf.bb | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
> index 20968f9..9776943 100644
> --- a/meta/recipes-kernel/perf/perf.bb
> +++ b/meta/recipes-kernel/perf/perf.bb
> @@ -76,7 +76,7 @@ EXTRA_OEMAKE = \
>   		CC="${CC}" \
>   		AR="${AR}" \
>   		perfexecdir=${libexecdir} \
> -		NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${SCRIPTING_DEFINES} \
> +		NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 NO_LIBUNWIND=1 ${SCRIPTING_DEFINES} \
>   		'
>
>   EXTRA_OEMAKE += "\
>

Re: [daisy][PATCH 2/2] perf: fix indentation

[Richard Purdie]

On Sun, 2014-08-10 at 11:38 +0200, Martin Jansa wrote:
> * multiline variables should use spaces not tabs for indentation
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/recipes-kernel/perf/perf.bb | 54 ++++++++++++++++++++--------------------
>  1 file changed, 27 insertions(+), 27 deletions(-)

Do we really need to backport whitespace changes?

Cheers,

Richard

Re: [daisy][PATCH 2/2] perf: fix indentation

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 612 bytes --]

On Mon, Aug 11, 2014 at 11:03:23AM +0100, Richard Purdie wrote:
> On Sun, 2014-08-10 at 11:38 +0200, Martin Jansa wrote:
> > * multiline variables should use spaces not tabs for indentation
> > 
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >  meta/recipes-kernel/perf/perf.bb | 54 ++++++++++++++++++++--------------------
> >  1 file changed, 27 insertions(+), 27 deletions(-)
> 
> Do we really need to backport whitespace changes?

It will make next possible backports to perf easier, but feel free to
skip this.

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]