Patchwork perf-3.4: fix hardcoded slang include dir

login
register
mail settings
Submitter rongqing.li@windriver.com
Date July 30, 2012, 9:06 a.m.
Message ID <1343639174-29579-1-git-send-email-rongqing.li@windriver.com>
Download mbox | patch
Permalink /patch/33275/
State New
Headers show

Comments

rongqing.li@windriver.com - July 30, 2012, 9:06 a.m.
From: Roy.Li <rongqing.li@windriver.com>

[YOCTO #2853]

Sysroot in CFLAGS can not pass into Makefile, and slang include
dir becomes the hardcoded host dir, fix it by using STAGING_INCDIR.

And add dependency on slang

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
---
 meta/recipes-kernel/perf/perf_3.4.bb |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
Enrico Scholz - July 30, 2012, 9:43 a.m.
<rongqing.li-CWA4WttNNZF54TAoqtyWWQ@public.gmane.org> writes:

> +++ b/meta/recipes-kernel/perf/perf_3.4.bb
> ...
> +	sed -i "s:-I/usr/include/slang:-I${STAGING_INCDIR}:" ${S}/tools/perf/Makefile

You are patching an already staged file here:

 | S = "${STAGING_KERNEL_DIR}"

When want to fix it in this way (another workaround might be adding
'WERROR=0' to EXTRA_OEMAKE), it must be done in kernel.bbclass.


Enrico
rongqing.li@windriver.com - July 31, 2012, 3:24 a.m.
On 2012?07?30? 17:43, Enrico Scholz wrote:
> <rongqing.li-CWA4WttNNZF54TAoqtyWWQ@public.gmane.org> writes:
>
>> +++ b/meta/recipes-kernel/perf/perf_3.4.bb
>> ...
>> +	sed -i "s:-I/usr/include/slang:-I${STAGING_INCDIR}:" ${S}/tools/perf/Makefile
>
> You are patching an already staged file here:
>
>   | S = "${STAGING_KERNEL_DIR}"
>
> When want to fix it in this way (another workaround might be adding
> 'WERROR=0' to EXTRA_OEMAKE), it must be done in kernel.bbclass.
>
>
Thanks, I will modify it.

-Roy

> Enrico
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>
Darren Hart - Aug. 2, 2012, 7:53 p.m.
On 07/30/2012 08:24 PM, Rongqing Li wrote:
> 
> 
> On 2012?07?30? 17:43, Enrico Scholz wrote:
>> <rongqing.li-CWA4WttNNZF54TAoqtyWWQ@public.gmane.org> writes:
>>
>>> +++ b/meta/recipes-kernel/perf/perf_3.4.bb
>>> ...
>>> +	sed -i "s:-I/usr/include/slang:-I${STAGING_INCDIR}:" ${S}/tools/perf/Makefile
>>
>> You are patching an already staged file here:
>>
>>   | S = "${STAGING_KERNEL_DIR}"
>>
>> When want to fix it in this way (another workaround might be adding
>> 'WERROR=0' to EXTRA_OEMAKE), it must be done in kernel.bbclass.

That will indeed suppress the warning, but it doesn't resolve the host
contamination. A proper fix would be a patch against the kernel sources
. Every kernel will need this.

We can help you merge into the linux-yocto kernel.

>>
> Thanks, I will modify it.
> 
> -Roy
> 
>> Enrico
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>>
>>
>

Patch

diff --git a/meta/recipes-kernel/perf/perf_3.4.bb b/meta/recipes-kernel/perf/perf_3.4.bb
index 505c7b8..da746f4 100644
--- a/meta/recipes-kernel/perf/perf_3.4.bb
+++ b/meta/recipes-kernel/perf/perf_3.4.bb
@@ -9,7 +9,7 @@  as well."
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
-PR = "r4"
+PR = "r5"
 
 require perf.inc
 
@@ -24,6 +24,7 @@  DEPENDS = "virtual/kernel \
            ${MLPREFIX}binutils \
            ${TUI_DEPENDS} \
            ${SCRIPTING_DEPENDS} \
+           slang \
           "
 
 SCRIPTING_RDEPENDS = "${@perf_feature_enabled('perf-scripting', 'perl perl-modules python', '',d)}"
@@ -64,6 +65,9 @@  EXTRA_OEMAKE = \
 		prefix=/usr \
 		NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${SCRIPTING_DEFINES} \
 		'
+do_compile_prepend() {
+	sed -i "s:-I/usr/include/slang:-I${STAGING_INCDIR}:" ${S}/tools/perf/Makefile
+}
 
 do_compile() {
 	oe_runmake all