summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaura Abbott <labbott@fedoraproject.org>2017-01-06 14:01:15 -0800
committerLaura Abbott <labbott@fedoraproject.org>2017-01-06 14:02:53 -0800
commiteb69f22dd8b4aada75aa3a4582f98b951fa42cd8 (patch)
tree2860b25b7cd9457befe7f5d397d883e17715c59f
parent274bb77441fa8374c5a0e5fff1fd271a40f37a17 (diff)
downloadkernel-eb69f22dd8b4aada75aa3a4582f98b951fa42cd8.tar.gz
kernel-eb69f22dd8b4aada75aa3a4582f98b951fa42cd8.tar.xz
kernel-eb69f22dd8b4aada75aa3a4582f98b951fa42cd8.zip
Disable JVMTI for perf (rhbz 1410296)
perf introduced for profiling with JVMTI. Unfortunately, this introduces a dependnecy on java to the build process. We really really don't want this so set NO_JVMTI for now.
-rw-r--r--kernel.spec5
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index a79362c47..b9178297d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1646,7 +1646,7 @@ BuildKernel %make_target %kernel_image
%endif
%global perf_make \
- make -s EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 prefix=%{_prefix}
+ make -s EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 NO_JVMTI=1 prefix=%{_prefix}
%if %{with_perf}
# perf
# make sure check-headers.sh is executable
@@ -2152,6 +2152,9 @@ fi
#
#
%changelog
+* Fri Jan 06 2017 Laura Abbott <labbott@fedoraproject.org>
+- Disable JVMTI for perf (rhbz 1410296)
+
* Fri Jan 06 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc2.git4.1
- Linux v4.10-rc2-207-g88ba6ca