kernel-5.13.0-0.rc3.20210527gitad9f25d33860.28

* Thu May 27 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc3.20210527gitad9f25d33860.28]
- spec: Enable sefltests rpm build (Jiri Olsa)
- spec: Allow bpf selftest/samples to fail (Jiri Olsa)
- kvm: Add kvm_stat.service file and kvm_stat logrotate config to the tools (Jiri Benc)
- kernel.spec: Add missing source files to kernel-selftests-internal (Jiri Benc)
- kernel.spec: selftests: add net/forwarding to TARGETS list (Jiri Benc)
- kernel.spec: selftests: add build requirement on libmnl-devel (Jiri Benc)
- kernel.spec: add action.o to kernel-selftests-internal (Jiri Benc)
- kernel.spec: avoid building bpftool repeatedly (Jiri Benc)
- kernel.spec: selftests require python3 (Jiri Benc)
- kernel.spec: skip selftests that failed to build (Jiri Benc)
- kernel.spec: fix installation of bpf selftests (Jiri Benc)
- redhat: fix samples and selftests make options (Jiri Benc)
- kernel.spec: enable mptcp selftests for kernel-selftests-internal (Jiri Benc)
- kernel.spec: Do not export shared objects from libexecdir to RPM Provides (Jiri Benc)
- kernel.spec: add missing dependency for the which package (Jiri Benc)
- kernel.spec: add netfilter selftests to kernel-selftests-internal (Jiri Benc)
- kernel.spec: move slabinfo and page_owner_sort debuginfo to tools-debuginfo (Jiri Benc)
- kernel.spec: package and ship VM tools (Jiri Benc)
- configs: enable CONFIG_PAGE_OWNER (Jiri Benc)
- kernel.spec: add coreutils (Jiri Benc)
- kernel.spec: add netdevsim driver selftests to kernel-selftests-internal (Jiri Benc)
- redhat/Makefile: Clean out the --without flags from the baseonly rule (Jiri Benc)
- kernel.spec: Stop building unnecessary rpms for baseonly builds (Jiri Benc)
- kernel.spec: disable more kabi switches for gcov build (Jiri Benc)
- kernel.spec: Rename kabi-dw base (Jiri Benc)
- kernel.spec: Fix error messages during build of zfcpdump kernel (Jiri Benc)
- kernel.spec: perf: remove bpf examples (Jiri Benc)
- kernel.spec: selftests should not depend on modules-internal (Jiri Benc)
- kernel.spec: build samples (Jiri Benc)
- kernel.spec: tools: sync missing options with RHEL 8 (Jiri Benc)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2021-05-27 11:30:07 -05:00
parent 005d54b78b
commit a258481f4d
No known key found for this signature in database
GPG Key ID: B8FA7924A4B1C140
26 changed files with 189 additions and 70 deletions

View File

@ -12,7 +12,7 @@ RHEL_MINOR = 99
# #
# Use this spot to avoid future merge conflicts. # Use this spot to avoid future merge conflicts.
# Do not trim this comment. # Do not trim this comment.
RHEL_RELEASE = 27 RHEL_RELEASE = 28
# #
# Early y+1 numbering # Early y+1 numbering

View File

@ -4911,8 +4911,8 @@ CONFIG_PA12203001=m
CONFIG_PACKET_DIAG=m CONFIG_PACKET_DIAG=m
CONFIG_PACKET=y CONFIG_PACKET=y
CONFIG_PACKING=y CONFIG_PACKING=y
# CONFIG_PAGE_EXTENSION is not set CONFIG_PAGE_EXTENSION=y
# CONFIG_PAGE_OWNER is not set CONFIG_PAGE_OWNER=y
CONFIG_PAGE_POISONING=y CONFIG_PAGE_POISONING=y
CONFIG_PAGE_REPORTING=y CONFIG_PAGE_REPORTING=y
# CONFIG_PANEL_CHANGE_MESSAGE is not set # CONFIG_PANEL_CHANGE_MESSAGE is not set

View File

@ -3954,7 +3954,7 @@ CONFIG_PACKET_DIAG=m
CONFIG_PACKET=y CONFIG_PACKET=y
# CONFIG_PACKING is not set # CONFIG_PACKING is not set
CONFIG_PAGE_EXTENSION=y CONFIG_PAGE_EXTENSION=y
# CONFIG_PAGE_OWNER is not set CONFIG_PAGE_OWNER=y
CONFIG_PAGE_POISONING=y CONFIG_PAGE_POISONING=y
CONFIG_PAGE_REPORTING=y CONFIG_PAGE_REPORTING=y
CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_PAGE_TABLE_ISOLATION=y

View File

@ -4888,8 +4888,8 @@ CONFIG_PA12203001=m
CONFIG_PACKET_DIAG=m CONFIG_PACKET_DIAG=m
CONFIG_PACKET=y CONFIG_PACKET=y
CONFIG_PACKING=y CONFIG_PACKING=y
# CONFIG_PAGE_EXTENSION is not set CONFIG_PAGE_EXTENSION=y
# CONFIG_PAGE_OWNER is not set CONFIG_PAGE_OWNER=y
CONFIG_PAGE_POISONING=y CONFIG_PAGE_POISONING=y
CONFIG_PAGE_REPORTING=y CONFIG_PAGE_REPORTING=y
# CONFIG_PANEL_CHANGE_MESSAGE is not set # CONFIG_PANEL_CHANGE_MESSAGE is not set

View File

@ -3933,8 +3933,8 @@ CONFIG_OVERLAY_FS=m
CONFIG_PACKET_DIAG=m CONFIG_PACKET_DIAG=m
CONFIG_PACKET=y CONFIG_PACKET=y
# CONFIG_PACKING is not set # CONFIG_PACKING is not set
# CONFIG_PAGE_EXTENSION is not set CONFIG_PAGE_EXTENSION=y
# CONFIG_PAGE_OWNER is not set CONFIG_PAGE_OWNER=y
CONFIG_PAGE_POISONING=y CONFIG_PAGE_POISONING=y
CONFIG_PAGE_REPORTING=y CONFIG_PAGE_REPORTING=y
CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_PAGE_TABLE_ISOLATION=y

View File

@ -5020,8 +5020,8 @@ CONFIG_PA12203001=m
CONFIG_PACKET_DIAG=m CONFIG_PACKET_DIAG=m
CONFIG_PACKET=y CONFIG_PACKET=y
CONFIG_PACKING=y CONFIG_PACKING=y
# CONFIG_PAGE_EXTENSION is not set CONFIG_PAGE_EXTENSION=y
# CONFIG_PAGE_OWNER is not set CONFIG_PAGE_OWNER=y
CONFIG_PAGE_POISONING=y CONFIG_PAGE_POISONING=y
CONFIG_PAGE_REPORTING=y CONFIG_PAGE_REPORTING=y
CONFIG_PALMAS_GPADC=m CONFIG_PALMAS_GPADC=m

View File

@ -4998,8 +4998,8 @@ CONFIG_PA12203001=m
CONFIG_PACKET_DIAG=m CONFIG_PACKET_DIAG=m
CONFIG_PACKET=y CONFIG_PACKET=y
CONFIG_PACKING=y CONFIG_PACKING=y
# CONFIG_PAGE_EXTENSION is not set CONFIG_PAGE_EXTENSION=y
# CONFIG_PAGE_OWNER is not set CONFIG_PAGE_OWNER=y
CONFIG_PAGE_POISONING=y CONFIG_PAGE_POISONING=y
CONFIG_PAGE_REPORTING=y CONFIG_PAGE_REPORTING=y
CONFIG_PALMAS_GPADC=m CONFIG_PALMAS_GPADC=m

View File

@ -4906,8 +4906,8 @@ CONFIG_PA12203001=m
CONFIG_PACKET_DIAG=m CONFIG_PACKET_DIAG=m
CONFIG_PACKET=y CONFIG_PACKET=y
CONFIG_PACKING=y CONFIG_PACKING=y
# CONFIG_PAGE_EXTENSION is not set CONFIG_PAGE_EXTENSION=y
# CONFIG_PAGE_OWNER is not set CONFIG_PAGE_OWNER=y
CONFIG_PAGE_POISONING=y CONFIG_PAGE_POISONING=y
CONFIG_PAGE_REPORTING=y CONFIG_PAGE_REPORTING=y
CONFIG_PALMAS_GPADC=m CONFIG_PALMAS_GPADC=m

View File

@ -4884,8 +4884,8 @@ CONFIG_PA12203001=m
CONFIG_PACKET_DIAG=m CONFIG_PACKET_DIAG=m
CONFIG_PACKET=y CONFIG_PACKET=y
CONFIG_PACKING=y CONFIG_PACKING=y
# CONFIG_PAGE_EXTENSION is not set CONFIG_PAGE_EXTENSION=y
# CONFIG_PAGE_OWNER is not set CONFIG_PAGE_OWNER=y
CONFIG_PAGE_POISONING=y CONFIG_PAGE_POISONING=y
CONFIG_PAGE_REPORTING=y CONFIG_PAGE_REPORTING=y
CONFIG_PALMAS_GPADC=m CONFIG_PALMAS_GPADC=m

View File

@ -4492,8 +4492,8 @@ CONFIG_PA12203001=m
CONFIG_PACKET_DIAG=m CONFIG_PACKET_DIAG=m
CONFIG_PACKET=y CONFIG_PACKET=y
CONFIG_PACKING=y CONFIG_PACKING=y
# CONFIG_PAGE_EXTENSION is not set CONFIG_PAGE_EXTENSION=y
# CONFIG_PAGE_OWNER is not set CONFIG_PAGE_OWNER=y
CONFIG_PAGE_POISONING=y CONFIG_PAGE_POISONING=y
CONFIG_PAGE_REPORTING=y CONFIG_PAGE_REPORTING=y
CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_PAGE_TABLE_ISOLATION=y

View File

@ -4470,8 +4470,8 @@ CONFIG_PA12203001=m
CONFIG_PACKET_DIAG=m CONFIG_PACKET_DIAG=m
CONFIG_PACKET=y CONFIG_PACKET=y
CONFIG_PACKING=y CONFIG_PACKING=y
# CONFIG_PAGE_EXTENSION is not set CONFIG_PAGE_EXTENSION=y
# CONFIG_PAGE_OWNER is not set CONFIG_PAGE_OWNER=y
CONFIG_PAGE_POISONING=y CONFIG_PAGE_POISONING=y
CONFIG_PAGE_REPORTING=y CONFIG_PAGE_REPORTING=y
CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_PAGE_TABLE_ISOLATION=y

View File

@ -4215,8 +4215,8 @@ CONFIG_PA12203001=m
CONFIG_PACKET_DIAG=m CONFIG_PACKET_DIAG=m
CONFIG_PACKET=y CONFIG_PACKET=y
CONFIG_PACKING=y CONFIG_PACKING=y
# CONFIG_PAGE_EXTENSION is not set CONFIG_PAGE_EXTENSION=y
# CONFIG_PAGE_OWNER is not set CONFIG_PAGE_OWNER=y
CONFIG_PAGE_POISONING=y CONFIG_PAGE_POISONING=y
CONFIG_PAGE_REPORTING=y CONFIG_PAGE_REPORTING=y
# CONFIG_PANEL_CHANGE_MESSAGE is not set # CONFIG_PANEL_CHANGE_MESSAGE is not set

View File

@ -3784,7 +3784,7 @@ CONFIG_PACKET_DIAG=m
CONFIG_PACKET=y CONFIG_PACKET=y
# CONFIG_PACKING is not set # CONFIG_PACKING is not set
CONFIG_PAGE_EXTENSION=y CONFIG_PAGE_EXTENSION=y
# CONFIG_PAGE_OWNER is not set CONFIG_PAGE_OWNER=y
CONFIG_PAGE_POISONING=y CONFIG_PAGE_POISONING=y
CONFIG_PAGE_REPORTING=y CONFIG_PAGE_REPORTING=y
CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_PAGE_TABLE_ISOLATION=y

View File

@ -4192,8 +4192,8 @@ CONFIG_PA12203001=m
CONFIG_PACKET_DIAG=m CONFIG_PACKET_DIAG=m
CONFIG_PACKET=y CONFIG_PACKET=y
CONFIG_PACKING=y CONFIG_PACKING=y
# CONFIG_PAGE_EXTENSION is not set CONFIG_PAGE_EXTENSION=y
# CONFIG_PAGE_OWNER is not set CONFIG_PAGE_OWNER=y
CONFIG_PAGE_POISONING=y CONFIG_PAGE_POISONING=y
CONFIG_PAGE_REPORTING=y CONFIG_PAGE_REPORTING=y
# CONFIG_PANEL_CHANGE_MESSAGE is not set # CONFIG_PANEL_CHANGE_MESSAGE is not set

View File

@ -3766,8 +3766,8 @@ CONFIG_OVERLAY_FS=m
CONFIG_PACKET_DIAG=m CONFIG_PACKET_DIAG=m
CONFIG_PACKET=y CONFIG_PACKET=y
# CONFIG_PACKING is not set # CONFIG_PACKING is not set
# CONFIG_PAGE_EXTENSION is not set CONFIG_PAGE_EXTENSION=y
# CONFIG_PAGE_OWNER is not set CONFIG_PAGE_OWNER=y
CONFIG_PAGE_POISONING=y CONFIG_PAGE_POISONING=y
CONFIG_PAGE_REPORTING=y CONFIG_PAGE_REPORTING=y
CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_PAGE_TABLE_ISOLATION=y

View File

@ -4183,8 +4183,8 @@ CONFIG_PACKET_DIAG=m
CONFIG_PACKET=y CONFIG_PACKET=y
CONFIG_PACKING=y CONFIG_PACKING=y
CONFIG_PACK_STACK=y CONFIG_PACK_STACK=y
# CONFIG_PAGE_EXTENSION is not set CONFIG_PAGE_EXTENSION=y
# CONFIG_PAGE_OWNER is not set CONFIG_PAGE_OWNER=y
CONFIG_PAGE_POISONING=y CONFIG_PAGE_POISONING=y
CONFIG_PAGE_REPORTING=y CONFIG_PAGE_REPORTING=y
# CONFIG_PANEL_CHANGE_MESSAGE is not set # CONFIG_PANEL_CHANGE_MESSAGE is not set

View File

@ -3762,7 +3762,7 @@ CONFIG_PACKET=y
# CONFIG_PACKING is not set # CONFIG_PACKING is not set
CONFIG_PACK_STACK=y CONFIG_PACK_STACK=y
CONFIG_PAGE_EXTENSION=y CONFIG_PAGE_EXTENSION=y
# CONFIG_PAGE_OWNER is not set CONFIG_PAGE_OWNER=y
CONFIG_PAGE_POISONING=y CONFIG_PAGE_POISONING=y
CONFIG_PAGE_REPORTING=y CONFIG_PAGE_REPORTING=y
CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_PAGE_TABLE_ISOLATION=y

View File

@ -4160,8 +4160,8 @@ CONFIG_PACKET_DIAG=m
CONFIG_PACKET=y CONFIG_PACKET=y
CONFIG_PACKING=y CONFIG_PACKING=y
CONFIG_PACK_STACK=y CONFIG_PACK_STACK=y
# CONFIG_PAGE_EXTENSION is not set CONFIG_PAGE_EXTENSION=y
# CONFIG_PAGE_OWNER is not set CONFIG_PAGE_OWNER=y
CONFIG_PAGE_POISONING=y CONFIG_PAGE_POISONING=y
CONFIG_PAGE_REPORTING=y CONFIG_PAGE_REPORTING=y
# CONFIG_PANEL_CHANGE_MESSAGE is not set # CONFIG_PANEL_CHANGE_MESSAGE is not set

View File

@ -3744,8 +3744,8 @@ CONFIG_PACKET_DIAG=m
CONFIG_PACKET=y CONFIG_PACKET=y
# CONFIG_PACKING is not set # CONFIG_PACKING is not set
CONFIG_PACK_STACK=y CONFIG_PACK_STACK=y
# CONFIG_PAGE_EXTENSION is not set CONFIG_PAGE_EXTENSION=y
# CONFIG_PAGE_OWNER is not set CONFIG_PAGE_OWNER=y
CONFIG_PAGE_POISONING=y CONFIG_PAGE_POISONING=y
CONFIG_PAGE_REPORTING=y CONFIG_PAGE_REPORTING=y
CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_PAGE_TABLE_ISOLATION=y

View File

@ -4540,8 +4540,8 @@ CONFIG_PA12203001=m
CONFIG_PACKET_DIAG=m CONFIG_PACKET_DIAG=m
CONFIG_PACKET=y CONFIG_PACKET=y
CONFIG_PACKING=y CONFIG_PACKING=y
# CONFIG_PAGE_EXTENSION is not set CONFIG_PAGE_EXTENSION=y
# CONFIG_PAGE_OWNER is not set CONFIG_PAGE_OWNER=y
CONFIG_PAGE_POISONING=y CONFIG_PAGE_POISONING=y
CONFIG_PAGE_REPORTING=y CONFIG_PAGE_REPORTING=y
CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_PAGE_TABLE_ISOLATION=y

View File

@ -3975,7 +3975,7 @@ CONFIG_PACKET_DIAG=m
CONFIG_PACKET=y CONFIG_PACKET=y
# CONFIG_PACKING is not set # CONFIG_PACKING is not set
CONFIG_PAGE_EXTENSION=y CONFIG_PAGE_EXTENSION=y
# CONFIG_PAGE_OWNER is not set CONFIG_PAGE_OWNER=y
CONFIG_PAGE_POISONING=y CONFIG_PAGE_POISONING=y
CONFIG_PAGE_REPORTING=y CONFIG_PAGE_REPORTING=y
CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_PAGE_TABLE_ISOLATION=y

View File

@ -4518,8 +4518,8 @@ CONFIG_PA12203001=m
CONFIG_PACKET_DIAG=m CONFIG_PACKET_DIAG=m
CONFIG_PACKET=y CONFIG_PACKET=y
CONFIG_PACKING=y CONFIG_PACKING=y
# CONFIG_PAGE_EXTENSION is not set CONFIG_PAGE_EXTENSION=y
# CONFIG_PAGE_OWNER is not set CONFIG_PAGE_OWNER=y
CONFIG_PAGE_POISONING=y CONFIG_PAGE_POISONING=y
CONFIG_PAGE_REPORTING=y CONFIG_PAGE_REPORTING=y
CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_PAGE_TABLE_ISOLATION=y

View File

@ -3955,8 +3955,8 @@ CONFIG_OVERLAY_FS=m
CONFIG_PACKET_DIAG=m CONFIG_PACKET_DIAG=m
CONFIG_PACKET=y CONFIG_PACKET=y
# CONFIG_PACKING is not set # CONFIG_PACKING is not set
# CONFIG_PAGE_EXTENSION is not set CONFIG_PAGE_EXTENSION=y
# CONFIG_PAGE_OWNER is not set CONFIG_PAGE_OWNER=y
CONFIG_PAGE_POISONING=y CONFIG_PAGE_POISONING=y
CONFIG_PAGE_REPORTING=y CONFIG_PAGE_REPORTING=y
CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_PAGE_TABLE_ISOLATION=y

View File

@ -73,7 +73,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.) # the --with-release option overrides this setting.)
%define debugbuildsenabled 0 %define debugbuildsenabled 0
%global distro_build 0.rc3.20210526gitad9f25d33860.27 %global distro_build 0.rc3.20210527gitad9f25d33860.28
%if 0%{?fedora} %if 0%{?fedora}
%define secure_boot_arch x86_64 %define secure_boot_arch x86_64
@ -117,16 +117,20 @@ Summary: The Linux kernel
%define kversion 5.13 %define kversion 5.13
%define rpmversion 5.13.0 %define rpmversion 5.13.0
%define pkgrelease 0.rc3.20210526gitad9f25d33860.27 %define pkgrelease 0.rc3.20210527gitad9f25d33860.28
# This is needed to do merge window version magic # This is needed to do merge window version magic
%define patchlevel 13 %define patchlevel 13
# allow pkg_release to have configurable %%{?dist} tag # allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc3.20210526gitad9f25d33860.27%{?buildid}%{?dist} %define specrelease 0.rc3.20210527gitad9f25d33860.28%{?buildid}%{?dist}
%define pkg_release %{specrelease} %define pkg_release %{specrelease}
# libexec dir is not used by the linker, so the shared object there
# should not be exported to RPM provides
%global __provides_exclude_from ^%{_libexecdir}/kselftests
# The following build options are enabled by default, but may become disabled # The following build options are enabled by default, but may become disabled
# by later architecture-specific checks. These can also be disabled by using # by later architecture-specific checks. These can also be disabled by using
# --without <opt> in the rpmbuild command, or by forcing these values to 0. # --without <opt> in the rpmbuild command, or by forcing these values to 0.
@ -211,8 +215,6 @@ Summary: The Linux kernel
# Kernel headers are being split out into a separate package # Kernel headers are being split out into a separate package
%define with_headers 0 %define with_headers 0
%define with_cross_headers 0 %define with_cross_headers 0
# no selftests for now
%define with_selftests 0
# no ipa_clone for now # no ipa_clone for now
%define with_ipaclones 0 %define with_ipaclones 0
# no whitelist # no whitelist
@ -241,6 +243,8 @@ Summary: The Linux kernel
%define with_kabichk 0 %define with_kabichk 0
%define with_kabidupchk 0 %define with_kabidupchk 0
%define with_kabidwchk 0 %define with_kabidwchk 0
%define with_kabidw_base 0
%define with_kernel_abi_whitelists 0
%endif %endif
# turn off kABI DWARF-based check if we're generating the base dataset # turn off kABI DWARF-based check if we're generating the base dataset
@ -299,6 +303,15 @@ Summary: The Linux kernel
%if %{with_baseonly} %if %{with_baseonly}
%define with_pae 0 %define with_pae 0
%define with_debug 0 %define with_debug 0
%define with_vdso_install 0
%define with_perf 0
%define with_tools 0
%define with_bpftool 0
%define with_kernel_abi_whitelists 0
%define with_selftests 0
%define with_cross 0
%define with_cross_headers 0
%define with_ipaclones 0
%endif %endif
# if requested, only build pae kernel # if requested, only build pae kernel
@ -310,9 +323,15 @@ Summary: The Linux kernel
# if requested, only build debug kernel # if requested, only build debug kernel
%if %{with_dbgonly} %if %{with_dbgonly}
%define with_up 0 %define with_up 0
%define with_tools 0 %define with_vdso_install 0
%define with_perf 0 %define with_perf 0
%define with_tools 0
%define with_bpftool 0 %define with_bpftool 0
%define with_kernel_abi_whitelists 0
%define with_selftests 0
%define with_cross 0
%define with_cross_headers 0
%define with_ipaclones 0
%endif %endif
# turn off kABI DUP check and DWARF-based check if kABI check is disabled # turn off kABI DUP check and DWARF-based check if kABI check is disabled
@ -325,6 +344,10 @@ Summary: The Linux kernel
%define use_vdso 1 %define use_vdso 1
%endif %endif
# selftests require bpftool to be built
%if %{with_selftests}
%define with_bpftool 1
%endif
%ifnarch noarch %ifnarch noarch
%define with_kernel_abi_whitelists 0 %define with_kernel_abi_whitelists 0
@ -524,7 +547,7 @@ Requires: kernel-modules-uname-r = %{KVERREL}
# #
# List the packages used during the kernel build # List the packages used during the kernel build
# #
BuildRequires: kmod, patch, bash, tar, git-core BuildRequires: kmod, patch, bash, coreutils, tar, git-core, which
BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk
BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex, gcc-c++ BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex, gcc-c++
BuildRequires: net-tools, hostname, bc, elfutils-devel BuildRequires: net-tools, hostname, bc, elfutils-devel
@ -567,7 +590,7 @@ BuildRequires: clang llvm
%ifnarch %{arm} %ifnarch %{arm}
BuildRequires: numactl-devel BuildRequires: numactl-devel
%endif %endif
BuildRequires: libcap-devel libcap-ng-devel rsync BuildRequires: libcap-devel libcap-ng-devel rsync libmnl-devel
%endif %endif
BuildConflicts: rhbuildsys(DiskFree) < 500Mb BuildConflicts: rhbuildsys(DiskFree) < 500Mb
%if %{with_debuginfo} %if %{with_debuginfo}
@ -762,6 +785,7 @@ Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2
# Sources for kernel-tools # Sources for kernel-tools
Source2000: cpupower.service Source2000: cpupower.service
Source2001: cpupower.config Source2001: cpupower.config
Source2002: kvm_stat.logrotate
# Some people enjoy building customized kernels from the dist-git in Fedora and # Some people enjoy building customized kernels from the dist-git in Fedora and
# use this to override configuration options. One day they may all use the # use this to override configuration options. One day they may all use the
@ -949,7 +973,7 @@ This package provides debug information for package kernel-tools.
# symlinks because of the trailing nonmatching alternation and # symlinks because of the trailing nonmatching alternation and
# the leading .*, because of find-debuginfo.sh's buggy handling # the leading .*, because of find-debuginfo.sh's buggy handling
# of matching the pattern against the symlinks file. # of matching the pattern against the symlinks file.
%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_bindir}/centrino-decode(\.debug)?|.*%%{_bindir}/powernow-k8-decode(\.debug)?|.*%%{_bindir}/cpupower(\.debug)?|.*%%{_libdir}/libcpupower.*|.*%%{_bindir}/turbostat(\.debug)?|.*%%{_bindir}/x86_energy_perf_policy(\.debug)?|.*%%{_bindir}/tmon(\.debug)?|.*%%{_bindir}/lsgpio(\.debug)?|.*%%{_bindir}/gpio-hammer(\.debug)?|.*%%{_bindir}/gpio-event-mon(\.debug)?|.*%%{_bindir}/gpio-watch(\.debug)?|.*%%{_bindir}/iio_event_monitor(\.debug)?|.*%%{_bindir}/iio_generic_buffer(\.debug)?|.*%%{_bindir}/lsiio(\.debug)?|.*%%{_bindir}/intel-speed-select(\.debug)?|XXX' -o kernel-tools-debuginfo.list} %{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_bindir}/centrino-decode(\.debug)?|.*%%{_bindir}/powernow-k8-decode(\.debug)?|.*%%{_bindir}/cpupower(\.debug)?|.*%%{_libdir}/libcpupower.*|.*%%{_bindir}/turbostat(\.debug)?|.*%%{_bindir}/x86_energy_perf_policy(\.debug)?|.*%%{_bindir}/tmon(\.debug)?|.*%%{_bindir}/lsgpio(\.debug)?|.*%%{_bindir}/gpio-hammer(\.debug)?|.*%%{_bindir}/gpio-event-mon(\.debug)?|.*%%{_bindir}/gpio-watch(\.debug)?|.*%%{_bindir}/iio_event_monitor(\.debug)?|.*%%{_bindir}/iio_generic_buffer(\.debug)?|.*%%{_bindir}/lsiio(\.debug)?|.*%%{_bindir}/intel-speed-select(\.debug)?|.*%%{_bindir}/page_owner_sort(\.debug)?|.*%%{_bindir}/slabinfo(\.debug)?|XXX' -o kernel-tools-debuginfo.list}
# with_tools # with_tools
%endif %endif
@ -981,8 +1005,7 @@ This package provides debug information for the bpftool package.
%package selftests-internal %package selftests-internal
Summary: Kernel samples and selftests Summary: Kernel samples and selftests
License: GPLv2 License: GPLv2
Requires: binutils, bpftool, iproute-tc, nmap-ncat Requires: binutils, bpftool, iproute-tc, nmap-ncat, python3
Requires: kernel-modules-internal = %{version}-%{release}
%description selftests-internal %description selftests-internal
Kernel sample programs and selftests. Kernel sample programs and selftests.
@ -1011,13 +1034,13 @@ Linux kernel ABI, including lists of kernel symbols that are needed by
external Linux kernel modules, and a yum plugin to aid enforcement. external Linux kernel modules, and a yum plugin to aid enforcement.
%if %{with_kabidw_base} %if %{with_kabidw_base}
%package kabidw-base %package kernel-kabidw-base-internal
Summary: The baseline dataset for kABI verification using DWARF data Summary: The baseline dataset for kABI verification using DWARF data
Group: System Environment/Kernel Group: System Environment/Kernel
AutoReqProv: no AutoReqProv: no
%description kabidw-base %description kernel-kabidw-base-internal
The kabidw-base package contains data describing the current ABI of the Red Hat The package contains data describing the current ABI of the Red Hat Enterprise
Enterprise Linux kernel, suitable for the kabi-dw tool. Linux kernel, suitable for the kabi-dw tool.
%endif %endif
# #
@ -1679,7 +1702,7 @@ BuildKernel() {
%if %{with_kabidw_base} %if %{with_kabidw_base}
# Don't build kabi base for debug kernels # Don't build kabi base for debug kernels
if [ "$Variant" != "kdump" -a "$Variant" != "debug" ]; then if [ "$Variant" != "zfcpdump" -a "$Variant" != "debug" ]; then
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf mkdir -p $RPM_BUILD_ROOT/kabi-dwarf
tar xjvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf tar xjvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
@ -1698,7 +1721,7 @@ BuildKernel() {
%endif %endif
%if %{with_kabidwchk} %if %{with_kabidwchk}
if [ "$Variant" != "kdump" ]; then if [ "$Variant" != "zfcpdump" ]; then
mkdir -p $RPM_BUILD_ROOT/kabi-dwarf mkdir -p $RPM_BUILD_ROOT/kabi-dwarf
tar xjvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf tar xjvf %{SOURCE301} -C $RPM_BUILD_ROOT/kabi-dwarf
if [ -d "$RPM_BUILD_ROOT/kabi-dwarf/base/%{_target_cpu}${Variant:+.${Variant}}" ]; then if [ -d "$RPM_BUILD_ROOT/kabi-dwarf/base/%{_target_cpu}${Variant:+.${Variant}}" ]; then
@ -2090,7 +2113,7 @@ chmod +x tools/perf/check-headers.sh
# cpupower # cpupower
# make sure version-gen.sh is executable. # make sure version-gen.sh is executable.
chmod +x tools/power/cpupower/utils/version-gen.sh chmod +x tools/power/cpupower/utils/version-gen.sh
%{tools_make} %{?_smp_mflags} -C tools/power/cpupower CPUFREQ_BENCH=false %{tools_make} %{?_smp_mflags} -C tools/power/cpupower CPUFREQ_BENCH=false DEBUG=false
%ifarch x86_64 %ifarch x86_64
pushd tools/power/cpupower/debug/x86_64 pushd tools/power/cpupower/debug/x86_64
%{tools_make} %{?_smp_mflags} centrino-decode powernow-k8-decode %{tools_make} %{?_smp_mflags} centrino-decode powernow-k8-decode
@ -2119,6 +2142,10 @@ pushd tools/gpio/
# Needs to be fixed to pick up CFLAGS # Needs to be fixed to pick up CFLAGS
%{__make} %{__make}
popd popd
# build VM tools
pushd tools/vm/
%{tools_make} slabinfo page_owner_sort
popd
%endif %endif
%global bpftool_make \ %global bpftool_make \
@ -2130,12 +2157,36 @@ popd
%endif %endif
%if %{with_selftests} %if %{with_selftests}
%{make} -s %{?_smp_mflags} ARCH=$Arch V=1 samples/bpf/ # Unfortunately, samples/bpf/Makefile expects that the headers are installed
# in the source tree. We installed them previously to $RPM_BUILD_ROOT/usr
# but there's no way to tell the Makefile to take them from there.
%{make} %{?_smp_mflags} headers_install
%{make} %{?_smp_mflags} ARCH=$Arch V=1 samples/bpf/
# Prevent bpf selftests to build bpftool repeatedly:
export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
pushd tools/testing/selftests pushd tools/testing/selftests
# We need to install here because we need to call make with ARCH set which # We need to install here because we need to call make with ARCH set which
# doesn't seem possible to do in the install section. # doesn't seem possible to do in the install section.
%{make} -s %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net" INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests install %{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf livepatch net net/forwarding net/mptcp netfilter tc-testing" SKIP_TARGETS="" INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests install
# 'make install' for bpf is broken and upstream refuses to fix it.
# Install the needed files manually.
for dir in bpf bpf/no_alu32 bpf/progs; do
# In ARK, the rpm build continues even if some of the selftests
# cannot be built. It's not always possible to build selftests,
# as upstream sometimes dependens on too new llvm version or has
# other issues. If something did not get built, just skip it.
test -d $dir || continue
mkdir -p %{buildroot}%{_libexecdir}/kselftests/$dir
find $dir -maxdepth 1 -type f \( -executable -o -name '*.py' -o -name settings -o \
-name 'btf_dump_test_case_*.c' -o \
-name '*.o' -exec sh -c 'readelf -h "{}" | grep -q "^ Machine:.*BPF"' \; \) -print0 | \
xargs -0 cp -t %{buildroot}%{_libexecdir}/kselftests/$dir || true
done
popd popd
export -n BPFTOOL
%endif %endif
%if %{with_doc} %if %{with_doc}
@ -2297,12 +2348,7 @@ rm -f %{buildroot}%{_bindir}/trace
# remove examples # remove examples
rm -rf %{buildroot}/usr/lib/perf/examples rm -rf %{buildroot}/usr/lib/perf/examples
# remove the stray files that somehow got packaged rm -rf %{buildroot}/usr/lib/perf/include
rm -rf %{buildroot}/usr/lib/perf/include/bpf/bpf.h
rm -rf %{buildroot}/usr/lib/perf/include/bpf/stdio.h
rm -rf %{buildroot}/usr/lib/perf/include/bpf/linux/socket.h
rm -rf %{buildroot}/usr/lib/perf/include/bpf/pid_filter.h
rm -rf %{buildroot}/usr/lib/perf/include/bpf/unistd.h
# python-perf extension # python-perf extension
%{perf_make} DESTDIR=$RPM_BUILD_ROOT install-python_ext %{perf_make} DESTDIR=$RPM_BUILD_ROOT install-python_ext
@ -2350,9 +2396,16 @@ popd
pushd tools/gpio pushd tools/gpio
%{__make} DESTDIR=%{buildroot} install %{__make} DESTDIR=%{buildroot} install
popd popd
install -m644 -D %{SOURCE2002} %{buildroot}%{_sysconfdir}/logrotate.d/kvm_stat
pushd tools/kvm/kvm_stat pushd tools/kvm/kvm_stat
%{__make} INSTALL_ROOT=%{buildroot} install-tools %{__make} INSTALL_ROOT=%{buildroot} install-tools
%{__make} INSTALL_ROOT=%{buildroot} install-man %{__make} INSTALL_ROOT=%{buildroot} install-man
install -m644 -D kvm_stat.service %{buildroot}%{_unitdir}/kvm_stat.service
popd
# install VM tools
pushd tools/vm/
install -m755 slabinfo %{buildroot}%{_bindir}/slabinfo
install -m755 page_owner_sort %{buildroot}%{_bindir}/page_owner_sort
popd popd
%endif %endif
@ -2373,6 +2426,7 @@ install -m755 *.sh %{buildroot}%{_libexecdir}/ksamples/bpf
# test_lwt_bpf.sh compiles test_lwt_bpf.c when run; this works only from the # test_lwt_bpf.sh compiles test_lwt_bpf.c when run; this works only from the
# kernel tree. Just remove it. # kernel tree. Just remove it.
rm %{buildroot}%{_libexecdir}/ksamples/bpf/test_lwt_bpf.sh rm %{buildroot}%{_libexecdir}/ksamples/bpf/test_lwt_bpf.sh
install -m644 *_kern.o %{buildroot}%{_libexecdir}/ksamples/bpf || true
install -m644 tcp_bpf.readme %{buildroot}%{_libexecdir}/ksamples/bpf install -m644 tcp_bpf.readme %{buildroot}%{_libexecdir}/ksamples/bpf
popd popd
# install pktgen samples # install pktgen samples
@ -2388,12 +2442,24 @@ find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/
find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{} \; find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{} \;
find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{} \; find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/drivers/net/mlxsw/{} \;
popd popd
# install drivers/net/netdevsim selftests
pushd tools/testing/selftests/drivers/net/netdevsim
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/drivers/net/netdevsim/{} \;
find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/drivers/net/netdevsim/{} \;
find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/drivers/net/netdevsim/{} \;
popd
# install net/forwarding selftests # install net/forwarding selftests
pushd tools/testing/selftests/net/forwarding pushd tools/testing/selftests/net/forwarding
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/net/forwarding/{} \; find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/net/forwarding/{} \;
find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/net/forwarding/{} \; find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/net/forwarding/{} \;
find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/net/forwarding/{} \; find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/net/forwarding/{} \;
popd popd
# install net/mptcp selftests
pushd tools/testing/selftests/net/mptcp
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/net/mptcp/{} \;
find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/net/mptcp/{} \;
find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/net/mptcp/{} \;
popd
# install tc-testing selftests # install tc-testing selftests
pushd tools/testing/selftests/tc-testing pushd tools/testing/selftests/tc-testing
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/tc-testing/{} \; find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/tc-testing/{} \;
@ -2406,6 +2472,12 @@ find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/livepatch/{}
find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/livepatch/{} \; find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/livepatch/{} \;
find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/livepatch/{} \; find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/livepatch/{} \;
popd popd
# install netfilter selftests
pushd tools/testing/selftests/netfilter
find -type d -exec install -d %{buildroot}%{_libexecdir}/kselftests/netfilter/{} \;
find -type f -executable -exec install -D -m755 {} %{buildroot}%{_libexecdir}/kselftests/netfilter/{} \;
find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/kselftests/netfilter/{} \;
popd
%endif %endif
### ###
@ -2576,7 +2648,7 @@ fi
%if %{with_kabidw_base} %if %{with_kabidw_base}
%ifarch x86_64 s390x ppc64 ppc64le aarch64 %ifarch x86_64 s390x ppc64 ppc64le aarch64
%files kabidw-base %files kernel-kabidw-base-internal
%defattr(-,root,root) %defattr(-,root,root)
/kabidw-base/%{_target_cpu}/* /kabidw-base/%{_target_cpu}/*
%endif %endif
@ -2648,6 +2720,10 @@ fi
%{_bindir}/gpio-watch %{_bindir}/gpio-watch
%{_mandir}/man1/kvm_stat* %{_mandir}/man1/kvm_stat*
%{_bindir}/kvm_stat %{_bindir}/kvm_stat
%{_unitdir}/kvm_stat.service
%config(noreplace) %{_sysconfdir}/logrotate.d/kvm_stat
%{_bindir}/page_owner_sort
%{_bindir}/slabinfo
%if %{with_debuginfo} %if %{with_debuginfo}
%files -f kernel-tools-debuginfo.list -n kernel-tools-debuginfo %files -f kernel-tools-debuginfo.list -n kernel-tools-debuginfo
@ -2795,6 +2871,38 @@ fi
# #
# #
%changelog %changelog
* Thu May 27 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc3.20210527gitad9f25d33860.28]
- spec: Enable sefltests rpm build (Jiri Olsa)
- spec: Allow bpf selftest/samples to fail (Jiri Olsa)
- kvm: Add kvm_stat.service file and kvm_stat logrotate config to the tools (Jiri Benc)
- kernel.spec: Add missing source files to kernel-selftests-internal (Jiri Benc)
- kernel.spec: selftests: add net/forwarding to TARGETS list (Jiri Benc)
- kernel.spec: selftests: add build requirement on libmnl-devel (Jiri Benc)
- kernel.spec: add action.o to kernel-selftests-internal (Jiri Benc)
- kernel.spec: avoid building bpftool repeatedly (Jiri Benc)
- kernel.spec: selftests require python3 (Jiri Benc)
- kernel.spec: skip selftests that failed to build (Jiri Benc)
- kernel.spec: fix installation of bpf selftests (Jiri Benc)
- redhat: fix samples and selftests make options (Jiri Benc)
- kernel.spec: enable mptcp selftests for kernel-selftests-internal (Jiri Benc)
- kernel.spec: Do not export shared objects from libexecdir to RPM Provides (Jiri Benc)
- kernel.spec: add missing dependency for the which package (Jiri Benc)
- kernel.spec: add netfilter selftests to kernel-selftests-internal (Jiri Benc)
- kernel.spec: move slabinfo and page_owner_sort debuginfo to tools-debuginfo (Jiri Benc)
- kernel.spec: package and ship VM tools (Jiri Benc)
- configs: enable CONFIG_PAGE_OWNER (Jiri Benc)
- kernel.spec: add coreutils (Jiri Benc)
- kernel.spec: add netdevsim driver selftests to kernel-selftests-internal (Jiri Benc)
- redhat/Makefile: Clean out the --without flags from the baseonly rule (Jiri Benc)
- kernel.spec: Stop building unnecessary rpms for baseonly builds (Jiri Benc)
- kernel.spec: disable more kabi switches for gcov build (Jiri Benc)
- kernel.spec: Rename kabi-dw base (Jiri Benc)
- kernel.spec: Fix error messages during build of zfcpdump kernel (Jiri Benc)
- kernel.spec: perf: remove bpf examples (Jiri Benc)
- kernel.spec: selftests should not depend on modules-internal (Jiri Benc)
- kernel.spec: build samples (Jiri Benc)
- kernel.spec: tools: sync missing options with RHEL 8 (Jiri Benc)
* Wed May 26 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc3.20210526gitad9f25d33860.27] * Wed May 26 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc3.20210526gitad9f25d33860.27]
- team: mark team driver as deprecated (Hangbin Liu) [1945477] - team: mark team driver as deprecated (Hangbin Liu) [1945477]

11
kvm_stat.logrotate Normal file
View File

@ -0,0 +1,11 @@
/var/log/kvm_stat.csv {
size 10M
missingok
compress
maxage 30
rotate 5
nodateext
postrotate
/usr/bin/systemctl try-restart kvm_stat.service
endscript
}

View File

@ -1,3 +1,3 @@
SHA512 (linux-5.13-rc3-43-gad9f25d33860.tar.xz) = e77a1a9882ad788edde989734b48cc74979f495d6e15bd2d3bdd35a63f1cbc326a9b88e4485268e8fe599199c641c3ebaa96611a8fdde7b0613dd2181e20fcb6 SHA512 (linux-5.13-rc3-43-gad9f25d33860.tar.xz) = e77a1a9882ad788edde989734b48cc74979f495d6e15bd2d3bdd35a63f1cbc326a9b88e4485268e8fe599199c641c3ebaa96611a8fdde7b0613dd2181e20fcb6
SHA512 (kernel-abi-whitelists-5.13.0-0.rc3.20210526gitad9f25d33860.27.tar.bz2) = 285545a78faffdcae7c4049984e1ace1403831344e67cc2ac732863adf63fe87fbb2ffca9cf3df575c0cded2d0b08fb7204376a324e4067d44d57de761361169 SHA512 (kernel-abi-whitelists-5.13.0-0.rc3.20210527gitad9f25d33860.28.tar.bz2) = 98e2486ee10c067ca4926f9099673ac89de5504dbeba372f48012ff8be25bcd869ca628969f9d82c315ef6b0b03b0442008b52d499fbf9502606d5dd78be510a
SHA512 (kernel-kabi-dw-5.13.0-0.rc3.20210526gitad9f25d33860.27.tar.bz2) = 3aeeafb1005f279600a3e2e4b88f28e629fce1baa1207b46e410268aa5ee70a5eedd65986e573aad538cdb18764b30a6b10ec856c2a352c02a484cba198b0149 SHA512 (kernel-kabi-dw-5.13.0-0.rc3.20210527gitad9f25d33860.28.tar.bz2) = 2d556aef9e0a530069bfca1cb12d7d4070f5dc47d0417e4b5a214dc63c4f8b4d0186944ef28515ea5555ea22a43cba00e53698e924f33302c83b44387e2407c1