[oe-commits] Roy Li : perf: fix the install-python_ext on upstream kernel

[git at git.openembedded.org]

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

Author: Roy Li <rongqing.li at windriver.com>
Date:   Tue Sep 15 14:34:24 2015 +0800

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 at 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 at intel.com>

Signed-off-by: Roy Li <rongqing.li at windriver.com>
Signed-off-by: Ross Burton <ross.burton at intel.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 adb3a2c..241cca9 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -148,7 +148,7 @@ do_configure_prepend () {
             ${S}/tools/perf/Makefile.perf
     fi
     sed -i -e "s,--root='/\$(DESTDIR_SQ)',--prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(DESTDIR)\$(PYTHON_SITEPACKAGES_DIR)',g" \
-        ${S}/tools/perf/Makefile
+        ${S}/tools/perf/Makefile*
 
     if [ -e "${S}/tools/build/Makefile.build" ]; then
         sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \