kernel-6.13.0-0.rc0.20241127gitaaf20f870da0.11
* Wed Nov 27 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.13.0-0.rc0.aaf20f870da0.11] - Partially revert "crypto: akcipher - Disable signing and decryption" (Jan Stancek) Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes
parent
1adeedd338
commit
693d79c092
43 changed files with 149 additions and 133 deletions
122
kernel.spec
122
kernel.spec
|
|
@ -162,13 +162,13 @@ Summary: The Linux kernel
|
|||
%define specrpmversion 6.13.0
|
||||
%define specversion 6.13.0
|
||||
%define patchversion 6.13
|
||||
%define pkgrelease 0.rc0.20241126git7eef7e306d3c.10
|
||||
%define pkgrelease 0.rc0.20241127gitaaf20f870da0.11
|
||||
%define kversion 6
|
||||
%define tarfile_release 6.12-9567-g7eef7e306d3c
|
||||
%define tarfile_release 6.12-10296-gaaf20f870da0
|
||||
# This is needed to do merge window version magic
|
||||
%define patchlevel 13
|
||||
# This allows pkg_release to have configurable %%{?dist} tag
|
||||
%define specrelease 0.rc0.20241126git7eef7e306d3c.10%{?buildid}%{?dist}
|
||||
%define specrelease 0.rc0.20241127gitaaf20f870da0.11%{?buildid}%{?dist}
|
||||
# This defines the kabi tarball version
|
||||
%define kabiversion 6.13.0
|
||||
|
||||
|
|
@ -230,8 +230,6 @@ Summary: The Linux kernel
|
|||
%define with_libperf %{?_without_libperf: 0} %{?!_without_libperf: 1}
|
||||
# tools
|
||||
%define with_tools %{?_without_tools: 0} %{?!_without_tools: 1}
|
||||
# bpf tool
|
||||
%define with_bpftool %{?_without_bpftool: 0} %{?!_without_bpftool: 1}
|
||||
# kernel-debuginfo
|
||||
%define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1}
|
||||
# kernel-abi-stablelists
|
||||
|
|
@ -393,7 +391,6 @@ Summary: The Linux kernel
|
|||
%define with_perf 0
|
||||
%define with_libperf 0
|
||||
%define with_tools 0
|
||||
%define with_bpftool 0
|
||||
%define with_kernel_abi_stablelists 0
|
||||
%define with_selftests 0
|
||||
%define with_ipaclones 0
|
||||
|
|
@ -406,7 +403,6 @@ Summary: The Linux kernel
|
|||
%define with_perf 0
|
||||
%define with_libperf 0
|
||||
%define with_tools 0
|
||||
%define with_bpftool 0
|
||||
%define with_kernel_abi_stablelists 0
|
||||
%define with_selftests 0
|
||||
%define with_ipaclones 0
|
||||
|
|
@ -423,7 +419,6 @@ Summary: The Linux kernel
|
|||
%define with_perf 0
|
||||
%define with_libperf 0
|
||||
%define with_tools 0
|
||||
%define with_bpftool 0
|
||||
%define with_kernel_abi_stablelists 0
|
||||
%define with_selftests 0
|
||||
%define with_ipaclones 0
|
||||
|
|
@ -442,7 +437,6 @@ Summary: The Linux kernel
|
|||
%define with_debug 0
|
||||
%define with_debuginfo 0
|
||||
%define with_vdso_install 0
|
||||
%define with_bpftool 1
|
||||
%define with_selftests 1
|
||||
%endif
|
||||
|
||||
|
|
@ -491,16 +485,6 @@ Summary: The Linux kernel
|
|||
%define use_vdso 1
|
||||
%endif
|
||||
|
||||
# selftests require bpftool to be built. If bpftools is disabled, then disable selftests
|
||||
%if %{with_bpftool} == 0
|
||||
%define with_selftests 0
|
||||
%endif
|
||||
|
||||
# bpftool needs debuginfo to work
|
||||
%if %{with_debuginfo} == 0
|
||||
%define with_bpftool 0
|
||||
%endif
|
||||
|
||||
%ifnarch noarch
|
||||
%define with_kernel_abi_stablelists 0
|
||||
%endif
|
||||
|
|
@ -532,7 +516,6 @@ Summary: The Linux kernel
|
|||
%define with_tools 0
|
||||
%define with_perf 0
|
||||
%define with_libperf 0
|
||||
%define with_bpftool 0
|
||||
%define with_selftests 0
|
||||
%define with_debug 0
|
||||
%endif
|
||||
|
|
@ -634,7 +617,6 @@ Summary: The Linux kernel
|
|||
%define with_perf 0
|
||||
%define with_libperf 0
|
||||
%define with_tools 0
|
||||
%define with_bpftool 0
|
||||
%define with_selftests 0
|
||||
%define _enable_debug_packages 0
|
||||
%endif
|
||||
|
|
@ -782,12 +764,8 @@ BuildRequires: libnl3-devel
|
|||
%if %{with_tools} || %{signmodules} || %{signkernel}
|
||||
BuildRequires: openssl-devel
|
||||
%endif
|
||||
%if %{with_bpftool}
|
||||
BuildRequires: python3-docutils
|
||||
BuildRequires: zlib-devel binutils-devel llvm-devel
|
||||
%endif
|
||||
%if %{with_selftests}
|
||||
BuildRequires: clang llvm-devel fuse-devel
|
||||
BuildRequires: clang llvm-devel fuse-devel zlib-devel binutils-devel
|
||||
%ifarch x86_64 riscv64
|
||||
BuildRequires: lld
|
||||
%endif
|
||||
|
|
@ -1334,42 +1312,6 @@ analysing the logical and timing behavior of Linux.
|
|||
# with_tools
|
||||
%endif
|
||||
|
||||
%if %{with_bpftool}
|
||||
|
||||
%if 0%{?fedora}
|
||||
# bpftoolverion doesn't bump with stable updates so let's stick with
|
||||
# upstream kernel version for the package name. We still get correct
|
||||
# output with bpftool -V.
|
||||
%define bpftoolversion %specrpmversion
|
||||
%else
|
||||
%define bpftoolversion 7.6.0
|
||||
%endif
|
||||
|
||||
%package -n bpftool
|
||||
Summary: Inspection and simple manipulation of eBPF programs and maps
|
||||
Version: %{bpftoolversion}
|
||||
%description -n bpftool
|
||||
This package contains the bpftool, which allows inspection and simple
|
||||
manipulation of eBPF programs and maps.
|
||||
|
||||
%package -n bpftool-debuginfo
|
||||
Summary: Debug information for package bpftool
|
||||
Version: %{bpftoolversion}
|
||||
Group: Development/Debug
|
||||
Requires: %{name}-debuginfo-common-%{_target_cpu} = %{specrpmversion}-%{release}
|
||||
AutoReqProv: no
|
||||
%description -n bpftool-debuginfo
|
||||
This package provides debug information for the bpftool package.
|
||||
|
||||
%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_sbindir}/bpftool(\.debug)?|XXX' -o bpftool-debuginfo.list}
|
||||
|
||||
# Setting "Version:" above overrides the internal {version} macro,
|
||||
# need to restore it here
|
||||
%define version %{specrpmversion}
|
||||
|
||||
# with_bpftool
|
||||
%endif
|
||||
|
||||
%if %{with_selftests}
|
||||
|
||||
%package selftests-internal
|
||||
|
|
@ -3174,17 +3116,6 @@ if [ -f $DevelDir/vmlinux.h ]; then
|
|||
fi
|
||||
echo "${RPM_VMLINUX_H}" > ../vmlinux_h_path
|
||||
|
||||
%if %{with_bpftool}
|
||||
%global bpftool_make \
|
||||
%{__make} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_CXXFLAGS="${RPM_OPT_FLAGS}" EXTRA_LDFLAGS="%{__global_ldflags}" DESTDIR=$RPM_BUILD_ROOT %{?make_opts} VMLINUX_H="${RPM_VMLINUX_H}" V=1
|
||||
%{log_msg "build bpftool"}
|
||||
pushd tools/bpf/bpftool
|
||||
%{bpftool_make}
|
||||
popd
|
||||
%else
|
||||
%{log_msg "bpftools disabled ... disabling selftests"}
|
||||
%endif
|
||||
|
||||
%if %{with_selftests}
|
||||
%{log_msg "start build selftests"}
|
||||
# Unfortunately, samples/bpf/Makefile expects that the headers are installed
|
||||
|
|
@ -3204,9 +3135,6 @@ fi
|
|||
%{log_msg "build samples/bpf"}
|
||||
%{make} %{?_smp_mflags} ARCH=$Arch V=1 M=samples/bpf/ VMLINUX_H="${RPM_VMLINUX_H}" || true
|
||||
|
||||
# Prevent bpf selftests to build bpftool repeatedly:
|
||||
export BPFTOOL=$(pwd)/tools/bpf/bpftool/bpftool
|
||||
|
||||
pushd tools/testing/selftests
|
||||
# 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.
|
||||
|
|
@ -3244,7 +3172,6 @@ done
|
|||
%buildroot_save_unstripped "usr/libexec/kselftests/bpf/test_progs"
|
||||
%buildroot_save_unstripped "usr/libexec/kselftests/bpf/test_progs-no_alu32"
|
||||
popd
|
||||
export -n BPFTOOL
|
||||
%{log_msg "end build selftests"}
|
||||
%endif
|
||||
|
||||
|
|
@ -3496,14 +3423,6 @@ rm -f %{buildroot}%{_bindir}/timerlat
|
|||
popd
|
||||
%endif
|
||||
|
||||
%if !%{with_automotive}
|
||||
%if %{with_bpftool}
|
||||
pushd tools/bpf/bpftool
|
||||
%{bpftool_make} prefix=%{_prefix} bash_compdir=%{_sysconfdir}/bash_completion.d/ mandir=%{_mandir} install doc-install
|
||||
popd
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{with_selftests}
|
||||
pushd samples
|
||||
install -d %{buildroot}%{_libexecdir}/ksamples
|
||||
|
|
@ -4061,31 +3980,6 @@ fi\
|
|||
# with_tools
|
||||
%endif
|
||||
|
||||
%if !%{with_automotive}
|
||||
%if %{with_bpftool}
|
||||
%files -n bpftool
|
||||
%{_sbindir}/bpftool
|
||||
%{_sysconfdir}/bash_completion.d/bpftool
|
||||
%{_mandir}/man8/bpftool-cgroup.8.gz
|
||||
%{_mandir}/man8/bpftool-gen.8.gz
|
||||
%{_mandir}/man8/bpftool-iter.8.gz
|
||||
%{_mandir}/man8/bpftool-link.8.gz
|
||||
%{_mandir}/man8/bpftool-map.8.gz
|
||||
%{_mandir}/man8/bpftool-prog.8.gz
|
||||
%{_mandir}/man8/bpftool-perf.8.gz
|
||||
%{_mandir}/man8/bpftool.8.gz
|
||||
%{_mandir}/man8/bpftool-net.8.gz
|
||||
%{_mandir}/man8/bpftool-feature.8.gz
|
||||
%{_mandir}/man8/bpftool-btf.8.gz
|
||||
%{_mandir}/man8/bpftool-struct_ops.8.gz
|
||||
|
||||
%if %{with_debuginfo}
|
||||
%files -f bpftool-debuginfo.list -n bpftool-debuginfo
|
||||
%defattr(-,root,root)
|
||||
%endif
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if %{with_selftests}
|
||||
%files selftests-internal
|
||||
%{_libexecdir}/ksamples
|
||||
|
|
@ -4270,9 +4164,15 @@ fi\
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Tue Nov 26 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.13.0-0.rc0.7eef7e306d3c.10]
|
||||
* Wed Nov 27 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.13.0-0.rc0.aaf20f870da0.11]
|
||||
- Partially revert "crypto: akcipher - Disable signing and decryption" (Jan Stancek)
|
||||
|
||||
* Wed Nov 27 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.13.0-0.rc0.aaf20f870da0.10]
|
||||
- redhat/configs: enable SERIAL_AMBA_PL011 for automotive (Radu Rendec)
|
||||
- c10s: disable tests in CKI pipelines (Michael Hofmann)
|
||||
- redhat: Drop bpftool from kernel spec (Viktor Malik)
|
||||
- Linux v6.13.0-0.rc0.aaf20f870da0
|
||||
|
||||
* Tue Nov 26 2024 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.13.0-0.rc0.7eef7e306d3c.9]
|
||||
- Linux v6.13.0-0.rc0.7eef7e306d3c
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue