X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel-tools.spec;h=0ccdc9a855cb941b87d8b265e7b50a085895c8c7;hb=8202c6d805aacc7a8090ad39bf6fbc5dd8345df3;hp=963a17807a3719b07e39ae3847a4bec632e6e010;hpb=701b458f9f48976ed7c27e7e0ef913bc9599fd04;p=packages%2Fkernel-tools.git diff --git a/kernel-tools.spec b/kernel-tools.spec index 963a178..0ccdc9a 100644 --- a/kernel-tools.spec +++ b/kernel-tools.spec @@ -1,14 +1,18 @@ -# TODO -# - optflags +# TODO: +# - redefine: PACKAGE_BUGREPORT=cpufreq@vger.kernel.org +# - add -n python-perf? +# - without perf bcond does not work (it still builds it) +# - add bcond to disable building docs (perf docs) +# - install of perf compiles things over again -# # Conditional build: %bcond_without verbose # verbose build (V=1) %bcond_without perf # perf tools +%bcond_without gtk # gtk perf version -%define rel 0.5 -%define basever 3.7 -%define postver .1 +%define rel 1 +%define basever 3.10 +%define postver .19 Summary: Assortment of tools for the Linux kernel Summary(pl.UTF-8): Zestaw narzędzi dla jądra Linuksa Name: kernel-tools @@ -17,14 +21,16 @@ Release: %{rel} License: GPL v2 Group: Applications/System Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz -# Source0-md5: 21223369d682bcf44bcdfe1521095983 +# Source0-md5: 4f25cd5bec5f8d5a7d935b3f2ccb8481 %if "%{postver}" != ".0" -Patch0: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2 -# Patch0-md5: c391dc1a1b4dae81aaef6f08a0594813 +Patch0: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz +# Patch0-md5: b7f932eecbbf5636ad69add480fa1573 %endif Source1: cpupower.service Source2: cpupower.config URL: http://www.kernel.org/ +BuildRequires: gettext-tools +BuildRequires: pciutils-devel BuildRequires: rpmbuild(macros) >= 1.647 BuildRequires: tar >= 1:1.22 BuildRequires: xz @@ -33,18 +39,20 @@ BuildRequires: asciidoc BuildRequires: audit-libs-devel BuildRequires: binutils-devel BuildRequires: bison +BuildRequires: docbook-dtd45-xml BuildRequires: docbook-style-xsl BuildRequires: elfutils-devel BuildRequires: flex -BuildRequires: gtk+2-devel >= 2.0 BuildRequires: libunwind-devel >= 0.99 -BuildRequires: newt-devel BuildRequires: perl-devel >= 5.1 -BuildRequires: pkgconfig BuildRequires: python-devel BuildRequires: rpm-pythonprov BuildRequires: slang-devel BuildRequires: xmlto +%if %{with gtk} +BuildRequires: gtk+2-devel >= 2.0 +BuildRequires: pkgconfig +%endif %endif BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -63,6 +71,7 @@ Summary: cpupower - Shows and sets processor power related values Summary(pl.UTF-8): cpupower - wyświetlanie i ustawianie wartości związanych z zużyciem energii przez procesor Group: Applications/System Requires(post,preun,postun): systemd-units >= 38 +Requires: %{name}-cpupower-libs = %{version}-%{release} Requires: systemd-units >= 0.38 Provides: cpufreq-utils = 1:009-0.6.p1 Provides: cpufrequtils = 1:009-0.6.p1 @@ -71,7 +80,6 @@ Obsoletes: cpufreq-utils < 1:009-0.6.p1 Obsoletes: cpufrequtils < 1:009-0.6.p1 Obsoletes: cpupowerutils < 1:009-0.6.p1 Obsoletes: cpuspeed < 1:1.5-16 -Requires: %{name}-cpupower-libs = %{version}-%{release} %description cpupower cpupower is a collection of tools to examine and tune power saving @@ -98,7 +106,9 @@ Summary(pl.UTF-8): Pliki programistyczne biblioteki cpupower Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: %{name}-cpupower-libs = %{version}-%{release} +Provides: cpufrequtils-devel = 1:009-0.6.p1 Provides: cpupowerutils-devel = 1:009-0.6.p1 +Obsoletes: cpufrequtils-devel < 1:009-0.6.p1 Obsoletes: cpupowerutils-devel < 1:009-0.6.p1 %description cpupower-libs-devel @@ -181,7 +191,7 @@ Ten pakiet zawiera tekstowy interfejs oparty na bibliotece Slang. Summary: Bash completion for perf command Summary(pl.UTF-8): Bashowe uzupełnianie parametrów dla polecenia perf Group: Applications/Shells -Requires: %{name}-perf = %{version}-%{release} +Requires: %{name}-perf Requires: bash-completion %description -n bash-completion-perf @@ -201,32 +211,41 @@ cd linux-%{basever} %build cd linux-%{basever} +# Simple Disk Sleep Monitor +%{__cc} %{rpmcppflags} %{rpmcflags} %{rpmldflags} Documentation/laptops/dslm.c -o dslm + # cpupower %{__make} -C tools/power/cpupower \ %{makeopts} \ - CPUFREQ_BENCH=false + CPUFREQ_BENCH=false \ + OPTIMIZATION="%{rpmcflags}" \ + STRIPCMD=true %ifarch %{ix86} %{__make} -C tools/power/cpupower/debug/i386 centrino-decode powernow-k8-decode \ - %{makeopts} \ + CC="%{__cc}" \ + CFLAGS="%{rpmcflags}" %endif %ifarch %{x8664} %{__make} -C tools/power/cpupower/debug/x86_64 centrino-decode powernow-k8-decode \ - %{makeopts} + CC="%{__cc}" \ + CFLAGS="%{rpmcflags}" %endif %ifarch %{ix86} %{x8664} %{__make} -C tools/power/x86/x86_energy_perf_policy \ - %{makeopts} + CC="%{__cc}" \ + CFLAGS="%{rpmcflags}" %{__make} -C tools/power/x86/turbostat \ - %{makeopts} + CC="%{__cc}" \ + CFLAGS="%{rpmcflags} -Wall -I../../../../arch/x86/include/uapi/" %endif -# slabinfo -%{__make} -C tools/vm \ +# page-types, slabinfo +%{__make} -C tools/vm page-types slabinfo \ CC="%{__cc}" \ - CFLAGS="%{rpmcflags} -Wall -Wextra" + CFLAGS="%{rpmcflags} -Wall -Wextra -I../lib" %if %{with perf} # perf slang version @@ -236,26 +255,35 @@ install -d $PWD/perf-{slang,gtk} O=$PWD/perf-slang \ NO_GTK2=1 \ %{makeopts} \ + CFLAGS_OPTIMIZE="%{rpmcflags}" \ + WERROR=0 \ prefix=%{_prefix} \ perfexecdir=%{_datadir}/perf-core \ template_dir=%{_datadir}/perf-core/templates +%if %{with gtk} # perf gtk version %{__make} -C tools/perf all man \ O=$PWD/perf-gtk \ %{makeopts} \ + CFLAGS_OPTIMIZE="%{rpmcflags}" \ + WERROR=0 \ prefix=%{_prefix} \ perfexecdir=%{_datadir}/perf-core \ template_dir=%{_datadir}/perf-core/templates %endif +%endif # gen_init_cpio %{__make} -C usr gen_init_cpio \ %{makeopts} \ + CFLAGS="%{rpmcflags}" %install rm -rf $RPM_BUILD_ROOT + cd linux-%{basever} +install -d $RPM_BUILD_ROOT%{_sbindir} %{__make} -C tools/power/cpupower install \ DESTDIR=$RPM_BUILD_ROOT \ @@ -277,7 +305,9 @@ install -p tools/power/cpupower/debug/i386/{centrino,powernow-k8}-decode $RPM_BU install -p tools/power/cpupower/debug/x86_64/{centrino,powernow-k8}-decode $RPM_BUILD_ROOT%{_bindir} %endif -install tools/vm/slabinfo $RPM_BUILD_ROOT%{_bindir} +install -p tools/vm/slabinfo $RPM_BUILD_ROOT%{_bindir} +install -p tools/vm/page-types $RPM_BUILD_ROOT%{_sbindir} +install -p dslm $RPM_BUILD_ROOT%{_sbindir} %ifarch %{ix86} %{x8664} install -d $RPM_BUILD_ROOT%{_mandir}/man8 @@ -289,7 +319,7 @@ install -d $RPM_BUILD_ROOT%{_mandir}/man8 %else cd tools/power/x86/x86_energy_perf_policy install -p x86_energy_perf_policy $RPM_BUILD_ROOT%{_bindir} -install -p x86_energy_perf_policy.8 $RPM_BUILD_ROOT%{_mandir}/man8 +cp -p x86_energy_perf_policy.8 $RPM_BUILD_ROOT%{_mandir}/man8 cd - %endif @@ -300,9 +330,9 @@ cd - DESTDIR=$RPM_BUILD_ROOT %else cd tools/power/x86/turbostat -install -p turbostat $RPM_BUILD_ROOT%{_bindir}/turbostat -install -p turbostat.8 $RPM_BUILD_ROOT%{_mandir}/man8 +cp -p turbostat.8 $RPM_BUILD_ROOT%{_mandir}/man8 cd - +install -p turbostat $RPM_BUILD_ROOT%{_bindir}/turbostat %endif %endif @@ -315,27 +345,35 @@ PWD=${PWD:-$(pwd)} O=$PWD/perf-slang \ NO_GTK2=1 \ CC="%{__cc}" \ + CFLAGS_OPTIMIZE="%{rpmcflags}" \ + WERROR=0 \ %{?with_verbose:V=1} \ prefix=%{_prefix} \ perfexecdir=%{_datadir}/perf-core \ template_dir=%{_datadir}/perf-core/templates \ DESTDIR=$RPM_BUILD_ROOT -%{__mv} $RPM_BUILD_ROOT%{_bindir}/perf{,-slang} +%{__mv} $RPM_BUILD_ROOT%{_bindir}/perf{,_slang} +%if %{with gtk} # perf gtk %{__make} -j1 install install-man \ -C tools/perf \ O=$PWD/perf-gtk \ CC="%{__cc}" \ + CFLAGS_OPTIMIZE="%{rpmcflags}" \ + WERROR=0 \ %{?with_verbose:V=1} \ prefix=%{_prefix} \ perfexecdir=%{_datadir}/perf-core \ template_dir=%{_datadir}/perf-core/templates \ DESTDIR=$RPM_BUILD_ROOT -%{__mv} $RPM_BUILD_ROOT%{_bindir}/perf{,-gtk} +%{__mv} $RPM_BUILD_ROOT%{_bindir}/perf{,_gtk} +%endif %py_comp $RPM_BUILD_ROOT%{_datadir}/perf-core/scripts/python %py_ocomp $RPM_BUILD_ROOT%{_datadir}/perf-core/scripts/python + +rm -r $RPM_BUILD_ROOT%{_datadir}/perf-core/tests %endif # gen_init_cpio @@ -360,6 +398,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/gen_init_cpio %attr(755,root,root) %{_bindir}/slabinfo +%attr(755,root,root) %{_sbindir}/dslm +%attr(755,root,root) %{_sbindir}/page-types %ifarch %{ix86} %{x8664} %attr(755,root,root) %{_bindir}/centrino-decode %attr(755,root,root) %{_bindir}/powernow-k8-decode @@ -417,13 +457,15 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_datadir}/perf-core/scripts/python/bin/* %{_datadir}/perf-core/scripts/python/*.py* +%if %{with gtk} %files perf-gtk %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/perf-gtk +%attr(755,root,root) %{_bindir}/perf_gtk +%endif %files perf-slang %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/perf-slang +%attr(755,root,root) %{_bindir}/perf_slang %files -n bash-completion-perf %defattr(644,root,root,755)