summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel.spec7
-rwxr-xr-xscripts/generate-perf-man.sh6
-rw-r--r--sources2
3 files changed, 8 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec
index c89ecde17..b33b48cd5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -390,7 +390,7 @@ BuildRequires: numactl-devel
%endif
%endif
%if %{with_tools}
-BuildRequires: pciutils-devel gettext ncurses-devel asciidoc
+BuildRequires: pciutils-devel gettext ncurses-devel
%endif
BuildConflicts: rhbuildsys(DiskFree) < 500Mb
%if %{with_debuginfo}
@@ -1724,9 +1724,6 @@ popd
pushd tools/gpio/
%{make}
popd
-pushd tools/kvm/kvm_stat
-%{make}
-popd
%endif
# In the modsign case, we do 3 things. 1) We check the "flavour" and hard
@@ -1901,7 +1898,7 @@ pushd tools/gpio
make DESTDIR=%{buildroot} install
popd
pushd tools/kvm/kvm_stat
-make INSTALL_ROOT=%{buildroot} install
+make INSTALL_ROOT=%{buildroot} install-tools
popd
%endif
diff --git a/scripts/generate-perf-man.sh b/scripts/generate-perf-man.sh
index 27691fafd..f5332ad86 100755
--- a/scripts/generate-perf-man.sh
+++ b/scripts/generate-perf-man.sh
@@ -47,8 +47,12 @@ if [ ! -z "$@" ]; then
esac
done
fi
-cd tools/perf/Documentation/
+cd tools/kvm/kvm_stat/
+make man
+mv kvm_stat.1 ../../perf/Documentation
+cd ../../perf/Documentation/
make
tar -czvf $BASEDIR/perf-man-${KERNEL_VERSION}.${KERNEL_PATCHLEVEL}.tar.gz *.1
make clean
+rm kvm_stat.1
popd
diff --git a/sources b/sources
index 9df11d312..8d5f90599 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (perf-man-4.11.tar.gz) = 0b070d2f10a743329de2f532e2d7e19ef385a3e6ef3c700b591ae2697604dbe542b36e31121b3e37517ee8071ab800386fa8663c24a5b36520a18e096c6eefc8
-SHA512 (linux-4.11.tar.xz) = 6610eed97ffb7207c71771198c36179b8244ace7222bebb109507720e26c5f17d918079a56d5febdd8605844d67fb2df0ebe910fa2f2f53690daf6e2a8ad09c3
+SHA512 (perf-man-4.11.tar.gz) = f6dec8c3a296fc5bb1dd58011d7d1340550b9f4f228169bab079b0b36f2d5d96784b808765acda2d547719f6e9fd73b2855ab825dfe4fea8af43c55e5786f8d6
SHA512 (patch-4.11-git1.xz) = 192f4d8ba2c64040e01547d27b9f11f3a4471ed1103ab754a501a1ab12b054d7b26993ac56abe21f17319122d98aad1e98ed8b70864d73b42bf2c8491fadb5de