summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-04-19 13:56:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-19 14:47:35 +0100
commit76c473dbe9e6a1eb8bca89f26cf29b41ca18d680 (patch)
treee8bb2fb9c5ac0cb44cea19da924f7d7db2ef80b2
parent25f904b4f0f5a049ffabc7b3613d5902099d4ae0 (diff)
downloadopenembedded-core-contrib-76c473dbe9e6a1eb8bca89f26cf29b41ca18d680.tar.gz
openembedded-core-contrib-76c473dbe9e6a1eb8bca89f26cf29b41ca18d680.tar.bz2
openembedded-core-contrib-76c473dbe9e6a1eb8bca89f26cf29b41ca18d680.zip
perf: pass DESTDIR in EXTRA_OEMAKE
Instead of passing DESTDIR just in the make install invocation, pass it in EXTRA_OEMAKE. This appears to stop perf from rebuilding at instal time for me, which appears to be the trigger for the random build failure. [ YOCTO #9182 ] Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/perf/perf.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index c43f39cd1d..3d6ffb30fb 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -88,6 +88,7 @@ EXTRA_OEMAKE = '\
'
EXTRA_OEMAKE += "\
+ 'DESTDIR=${D}' \
'prefix=${prefix}' \
'bindir=${bindir}' \
'sharedir=${datadir}' \
@@ -110,7 +111,7 @@ do_compile() {
do_install() {
# Linux kernel build system is expected to do the right thing
unset CFLAGS
- oe_runmake DESTDIR=${D} install
+ oe_runmake install
# we are checking for this make target to be compatible with older perf versions
if [ "${@perf_feature_enabled('perf-scripting', 1, 0, d)}" = "1" ] && grep -q install-python_ext ${S}/tools/perf/Makefile*; then
oe_runmake DESTDIR=${D} install-python_ext