X-Git-Url: http://git.pld-linux.org/?p=packages%2Fkernel-tools.git;a=blobdiff_plain;f=kernel-tools.spec;h=058c19ac063e6569e5698ce8116863524566d2bc;hp=6f2f18115fa45e4508109186a02bd3f5cec99998;hb=930c3e7;hpb=c743e97db8f66f79d62d8f9c7119bd3b286b5be1 diff --git a/kernel-tools.spec b/kernel-tools.spec index 6f2f181..058c19a 100644 --- a/kernel-tools.spec +++ b/kernel-tools.spec @@ -13,15 +13,12 @@ %bcond_without multilib # multilib perf support %bcond_without usbip # usbip utils -%ifarch x32 -%undefine with_libunwind -%endif %ifnarch %{x8664} %undefine with_multilib %endif -%define basever 4.16 -%define postver .1 +%define basever 5.3 +%define postver .6 Summary: Assortment of tools for the Linux kernel Summary(pl.UTF-8): Zestaw narzędzi dla jądra Linuksa Name: kernel-tools @@ -29,45 +26,57 @@ Version: %{basever}%{postver} Release: 3 License: GPL v2 Group: Applications/System -Source0: https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz -# Source0-md5: 1357fb4ee7c288fdeac5d4e0048f5c18 +Source0: https://www.kernel.org/pub/linux/kernel/v5.x/linux-%{basever}.tar.xz +# Source0-md5: c99feaade8047339528fb066ec5f8a49 Source1: cpupower.service Source2: cpupower.config %if "%{postver}" != ".0" -Patch0: https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz -# Patch0-md5: bade764e616e8283b6a620f268337651 +Patch0: https://www.kernel.org/pub/linux/kernel/v5.x/patch-%{version}.xz +# Patch0-md5: 2c2db421d422d0d7306fe230c65c862c %endif Patch1: x32.patch +Patch2: regex.patch Patch3: %{name}-perf-update.patch -URL: http://www.kernel.org/ +Patch4: %{name}-perf-gtk2.patch +URL: https://www.kernel.org/ BuildRequires: bison +BuildRequires: docutils BuildRequires: flex BuildRequires: gettext-tools BuildRequires: linux-libc-headers >= 7:4.12 BuildRequires: ncurses-devel +BuildRequires: ncurses-ext-devel BuildRequires: pciutils-devel BuildRequires: pkgconfig +BuildRequires: python3 +BuildRequires: python3-modules BuildRequires: rpmbuild(macros) >= 1.673 BuildRequires: tar >= 1:1.22 BuildRequires: xz %if %{with perf} BuildRequires: asciidoc BuildRequires: audit-libs-devel +BuildRequires: babeltrace-devel BuildRequires: binutils-devel >= 4:2.29 BuildRequires: docbook-dtd45-xml BuildRequires: docbook-style-xsl -BuildRequires: elfutils-devel +BuildRequires: elfutils-devel >= 0.158 %if %{with multilib} BuildRequires: gcc-multilib-32 BuildRequires: gcc-multilib-x32 %endif %{?with_libunwind:BuildRequires: libunwind-devel >= 0.99} BuildRequires: numactl-devel +BuildRequires: openssl-devel BuildRequires: perl-devel >= 5.1 BuildRequires: python-devel BuildRequires: rpm-pythonprov BuildRequires: slang-devel BuildRequires: xmlto +BuildRequires: xz-devel +BuildRequires: zlib-devel +BuildRequires: zstd-devel +# openscd? (CORESIGHT=1 for %{arm}?) %if %{with gtk} BuildRequires: gtk+2-devel >= 2.0 %endif @@ -140,6 +149,22 @@ Development files for the cpupower library. %description cpupower-libs-devel -l pl.UTF-8 Pliki programistyczne biblioteki cpupower. +%package -n bash-completion-cpupower +Summary: Bash completion for cpupower tools +Summary(pl.UTF-8): Bashowe uzupełnianie parametrów dla poleceń cpupower +Group: Applications/Shells +Requires: %{name}-cpupower = %{version}-%{release} +Requires: bash-completion +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif + +%description -n bash-completion-cpupower +Bash completion for cpupower tools. + +%description -n bash-completion-cpupower -l pl.UTF-8 +Bashowe uzupełnianie parametrów dla poleceń cpupower. + %package hv Summary: Hyper-V virtualization tools Summary(pl.UTF-8): Narzędzia do wirtualizacji Hyper-V @@ -372,7 +397,9 @@ cd linux-%{basever} %endif %patch1 -p1 +%patch2 -p1 %patch3 -p1 +%patch4 -p1 %{__sed} -i -e '/^CFLAGS = /s/ -g / $(OPTFLAGS) /' tools/hv/Makefile %{__sed} -i -e '/^CFLAGS+=/s/ -O1 / $(OPTFLAGS) /' tools/thermal/tmon/Makefile @@ -382,6 +409,14 @@ cd linux-%{basever} %{__sed} -i -e '/^\$(LIBBPF): FORCE/ s/FORCE$//' tools/bpf/bpftool/Makefile %build +Wstringop="" +Waddressof="" +%if "%{cc_version}" >= "8" +Wstringop="-Wno-error=stringop-truncation" +%endif +%if "%{cc_version}" >= "9" +Waddressof="-Wno-error=address-of-packed-member" +%endif cd linux-%{basever} # Simple Disk Sleep Monitor @@ -392,7 +427,7 @@ cd linux-%{basever} # tools common (used eg. by tools/vm) %{__make} -C tools/lib/api \ %{makeopts} \ - EXTRA_CFLAGS="%{rpmcflags}" + EXTRA_CFLAGS="%{rpmcflags} $Wstringop" # lsgpio CFLAGS="%{rpmcflags}" \ @@ -415,6 +450,12 @@ CFLAGS="%{rpmcflags}" \ CC="%{__cc}" \ CFLAGS="%{rpmcflags}" +# make bpftool first, top-level bpf CFLAGS cause includes conflict +CFLAGS="%{rpmcflags}" \ +%{__make} -C tools/bpf/bpftool \ + CC="%{__cc}" \ + %{?with_verbose:V=1} + CFLAGS="%{rpmcflags}" \ %{__make} -C tools/bpf \ CC="%{__cc}" \ @@ -423,7 +464,7 @@ CFLAGS="%{rpmcflags}" \ # perf %if %{with perf} -%{__make} -C tools/perf all man \ +%{__make} -j1 -C tools/perf all man \ %ifarch %{x8664} IS_X86_64=1 \ %{!?with_multilib:NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1} \ @@ -483,6 +524,7 @@ cd tools/usb/usbip %{__autoheader} %{__automake} %configure \ + CFLAGS="%{rpmcflags} $Wstringop $Waddressof" \ --disable-silent-rules \ --with-usbids-dir=/lib/hwdata %{__make} @@ -512,7 +554,7 @@ cd linux-%{basever} CPUFREQ_BENCH=false %find_lang cpupower -mv cpupower.lang .. +%{__mv} cpupower.lang .. install -d $RPM_BUILD_ROOT{/etc/sysconfig,%{systemdunitdir}} cp -p %{SOURCE1} $RPM_BUILD_ROOT%{systemdunitdir}/cpupower.service @@ -527,7 +569,7 @@ install -p tools/power/cpupower/debug/x86_64/{centrino,powernow-k8}-decode $RPM_ %endif %if %{with perf} -%{__make} -C tools/perf -j1 install install-man \ +%{__make} -C tools/perf install install-man \ %ifarch %{x8664} IS_X86_64=1 \ %{!?with_multilib:NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1} \ @@ -541,6 +583,7 @@ install -p tools/power/cpupower/debug/x86_64/{centrino,powernow-k8}-decode $RPM_ prefix=%{_prefix} \ perfexecdir=%{_datadir}/perf-core \ template_dir=%{_datadir}/perf-core/templates \ + bash_compdir=%{bash_compdir} \ lib=%{_lib} \ DESTDIR=$RPM_BUILD_ROOT @@ -601,6 +644,9 @@ install -d $RPM_BUILD_ROOT%{_mandir}/man8 # gen_init_cpio install -p usr/gen_init_cpio $RPM_BUILD_ROOT%{_bindir}/gen_init_cpio +# packaged in man-pages (5.02) +%{__rm} $RPM_BUILD_ROOT%{_mandir}/man7/bpf-helpers.7* + %clean rm -rf $RPM_BUILD_ROOT @@ -666,6 +712,10 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/cpufreq.h %{_includedir}/cpuidle.h +%files -n bash-completion-cpupower +%defattr(644,root,root,755) +%{bash_compdir}/cpupower + %ifarch %{ix86} %{x8664} x32 %files hv %defattr(644,root,root,755) @@ -715,6 +765,10 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/traceevent/plugins %attr(755,root,root) %{_libdir}/traceevent/plugins/plugin_*.so +%dir %{_prefix}/lib/perf +%{_prefix}/lib/perf/examples +%{_prefix}/lib/perf/include + %if %{with multilib} %files perf-vdso32 %defattr(644,root,root,755)