summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoy Li <rongqing.li@windriver.com>2015-09-15 14:34:24 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-18 09:05:24 +0100
commitdb8f796bad36428586b67479252538904d49b6d2 (patch)
treef486bfd18b7d308a3fe4703c710ff396596d15d1 /meta
parentbfe2cd18619884e5a542d8a80e6b46a923146cc1 (diff)
downloadpoky-db8f796bad36428586b67479252538904d49b6d2.tar.gz
perf: fix the install-python_ext on upstream kernel
The Perf source code between Yocto and upstream are different, like below commit is not in upstream, so broaden the "--root" replacement to Makefile* commit 33e96fb1e2d77541e81eb341ccd3fbe9419e4c9a Author: Tom Zanussi <tom.zanussi@intel.com> Date: Tue Jul 3 13:07:23 2012 -0500 perf: change --root to --prefix for python install Otherwise we get the sysroot path appended to the build path, not what we want. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> (From OE-Core rev: c849ed0c66a2fb7d91795c421eb4c87b47d03c0d) Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/perf/perf.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index adb3a2cdcf..241cca97f0 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -148,7 +148,7 @@ do_configure_prepend () {
148 ${S}/tools/perf/Makefile.perf 148 ${S}/tools/perf/Makefile.perf
149 fi 149 fi
150 sed -i -e "s,--root='/\$(DESTDIR_SQ)',--prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(DESTDIR)\$(PYTHON_SITEPACKAGES_DIR)',g" \ 150 sed -i -e "s,--root='/\$(DESTDIR_SQ)',--prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(DESTDIR)\$(PYTHON_SITEPACKAGES_DIR)',g" \
151 ${S}/tools/perf/Makefile 151 ${S}/tools/perf/Makefile*
152 152
153 if [ -e "${S}/tools/build/Makefile.build" ]; then 153 if [ -e "${S}/tools/build/Makefile.build" ]; then
154 sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ 154 sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \