summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/perf/perf.bb8
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index b18e474de9..adb3a2cdcf 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -44,6 +44,7 @@ export STAGING_INCDIR
44export STAGING_LIBDIR 44export STAGING_LIBDIR
45export BUILD_SYS 45export BUILD_SYS
46export HOST_SYS 46export HOST_SYS
47export PYTHON_SITEPACKAGES_DIR
47 48
48#kernel 3.1+ supports WERROR to disable warnings as errors 49#kernel 3.1+ supports WERROR to disable warnings as errors
49export WERROR = "0" 50export WERROR = "0"
@@ -111,7 +112,7 @@ do_install() {
111 unset CFLAGS 112 unset CFLAGS
112 oe_runmake DESTDIR=${D} install 113 oe_runmake DESTDIR=${D} install
113 # we are checking for this make target to be compatible with older perf versions 114 # we are checking for this make target to be compatible with older perf versions
114 if [ "${@perf_feature_enabled('perf-scripting', 1, 0, d)}" = "1" -a $(grep install-python_ext ${S}/tools/perf/Makefile) = "0" ]; then 115 if [ "${@perf_feature_enabled('perf-scripting', 1, 0, d)}" = "1" ] && grep -q install-python_ext ${S}/tools/perf/Makefile*; then
115 oe_runmake DESTDIR=${D} install-python_ext 116 oe_runmake DESTDIR=${D} install-python_ext
116 fi 117 fi
117} 118}
@@ -143,7 +144,12 @@ do_configure_prepend () {
143 if [ -e "${S}/tools/perf/Makefile.perf" ]; then 144 if [ -e "${S}/tools/perf/Makefile.perf" ]; then
144 sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ 145 sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \
145 ${S}/tools/perf/Makefile.perf 146 ${S}/tools/perf/Makefile.perf
147 sed -i -e "s,prefix='\$(DESTDIR_SQ)/usr'$,prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(DESTDIR)\$(PYTHON_SITEPACKAGES_DIR)',g" \
148 ${S}/tools/perf/Makefile.perf
146 fi 149 fi
150 sed -i -e "s,--root='/\$(DESTDIR_SQ)',--prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(DESTDIR)\$(PYTHON_SITEPACKAGES_DIR)',g" \
151 ${S}/tools/perf/Makefile
152
147 if [ -e "${S}/tools/build/Makefile.build" ]; then 153 if [ -e "${S}/tools/build/Makefile.build" ]; then
148 sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ 154 sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \
149 ${S}/tools/build/Makefile.build 155 ${S}/tools/build/Makefile.build