ngompa/kernel-rpm
1
0
Fork 0
forked from rpms/kernel
Code Pull Requests Activity

kernel-6.12.0-32.el10

Browse Source 
* Mon Dec 02 2024 Jan Stancek <jstancek@redhat.com> [6.12.0-32.el10]
- selftests/bpf: Remove ksyms_weak_lskel test (Artem Savkov) [RHEL-48593]
- redhat/spec: Add libxml2-devel dependency for selftests build (Viktor Malik) [RHEL-48593]
- redhat/spec: Bypass check-rpaths for kselftests/bpf/urandom_read (Viktor Malik) [RHEL-48593]
- redhat/spec: Do not use source fortification for selftests (Viktor Malik) [RHEL-48593]
- redhat/spec: Fix BPF selftests build with PIE (Viktor Malik) [RHEL-48593]
- redhat/spec: Add EXTRA_CXXFLAGS to bpf samples and selftests make (Artem Savkov) [RHEL-48593]
- selftests/bpf: Allow building with extra flags (Viktor Malik) [RHEL-48593]
- selftests/bpf: Disable warnings on unused flags for Clang builds (Viktor Malik) [RHEL-48593]
- bpftool: Prevent setting duplicate _GNU_SOURCE in Makefile (Viktor Malik) [RHEL-48593]
Resolves: RHEL-48593

Signed-off-by: Jan Stancek <jstancek@redhat.com>
This commit is contained in:
Jan Stancek 2024-12-02 10:56:48 +01:00
parent 27979a949c
commit b786dc5239
4 changed files with 54 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.rhelver
View File

@ -12,7 +12,7 @@ RHEL_MINOR = 0
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
RHEL_RELEASE = 31
RHEL_RELEASE = 32
#
# RHEL_REBASE_NUM

12
kernel.changelog
View File

@ -1,3 +1,15 @@
* Mon Dec 02 2024 Jan Stancek <jstancek@redhat.com> [6.12.0-32.el10]
- selftests/bpf: Remove ksyms_weak_lskel test (Artem Savkov) [RHEL-48593]
- redhat/spec: Add libxml2-devel dependency for selftests build (Viktor Malik) [RHEL-48593]
- redhat/spec: Bypass check-rpaths for kselftests/bpf/urandom_read (Viktor Malik) [RHEL-48593]
- redhat/spec: Do not use source fortification for selftests (Viktor Malik) [RHEL-48593]
- redhat/spec: Fix BPF selftests build with PIE (Viktor Malik) [RHEL-48593]
- redhat/spec: Add EXTRA_CXXFLAGS to bpf samples and selftests make (Artem Savkov) [RHEL-48593]
- selftests/bpf: Allow building with extra flags (Viktor Malik) [RHEL-48593]
- selftests/bpf: Disable warnings on unused flags for Clang builds (Viktor Malik) [RHEL-48593]
- bpftool: Prevent setting duplicate _GNU_SOURCE in Makefile (Viktor Malik) [RHEL-48593]
Resolves: RHEL-48593
* Mon Nov 25 2024 Jan Stancek <jstancek@redhat.com> [6.12.0-31.el10]
- RHEL-only: mark io_uring tech preview and disable by default (Jeff Moyer) [RHEL-65347]
Resolves: RHEL-65347, RHEL-65498

45
kernel.spec
View File

@ -162,15 +162,15 @@ Summary: The Linux kernel
%define specrpmversion 6.12.0
%define specversion 6.12.0
%define patchversion 6.12
%define pkgrelease 31
%define pkgrelease 32
%define kversion 6
%define tarfile_release 6.12.0-31.el10
%define tarfile_release 6.12.0-32.el10
# This is needed to do merge window version magic
%define patchlevel 12
# This allows pkg_release to have configurable %%{?dist} tag
%define specrelease 31%{?buildid}%{?dist}
%define specrelease 32%{?buildid}%{?dist}
# This defines the kabi tarball version
%define kabiversion 6.12.0-31.el10
%define kabiversion 6.12.0-32.el10
# If this variable is set to 1, a bpf selftests build failure will cause a
# fatal kernel package build error
@ -791,7 +791,7 @@ BuildRequires: clang llvm-devel fuse-devel
%ifarch x86_64 riscv64
BuildRequires: lld
%endif
BuildRequires: libcap-devel libcap-ng-devel rsync libmnl-devel
BuildRequires: libcap-devel libcap-ng-devel rsync libmnl-devel libxml2-devel
BuildRequires: numactl-devel
%endif
BuildConflicts: rhbuildsys(DiskFree) < 500Mb
@ -3202,7 +3202,7 @@ if [ ! -f include/generated/autoconf.h ]; then
fi
%{log_msg "build samples/bpf"}
%{make} %{?_smp_mflags} ARCH=$Arch V=1 M=samples/bpf/ VMLINUX_H="${RPM_VMLINUX_H}" || true
%{make} %{?_smp_mflags} EXTRA_CXXFLAGS="${RPM_OPT_FLAGS}" 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
@ -3217,7 +3217,18 @@ pushd tools/testing/selftests
%endif
%{log_msg "main selftests compile"}
%{make} %{?_smp_mflags} ARCH=$Arch V=1 TARGETS="bpf cgroup mm net net/forwarding net/mptcp netfilter tc-testing memfd drivers/net/bonding iommu cachestat" SKIP_TARGETS="" $force_targets INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install
# Some selftests (especially bpf) do not build with source fortification.
# Since selftests are not shipped, disable source fortification for them.
%global _fortify_level_bak %{_fortify_level}
%undefine _fortify_level
export CFLAGS="%{build_cflags}"
%{make} %{?_smp_mflags} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_CXXFLAGS="${RPM_OPT_FLAGS}" EXTRA_LDFLAGS="%{__global_ldflags}" ARCH=$Arch V=1 TARGETS="bpf cgroup mm net net/forwarding net/mptcp netfilter tc-testing memfd drivers/net/bonding iommu cachestat" SKIP_TARGETS="" $force_targets INSTALL_PATH=%{buildroot}%{_libexecdir}/kselftests VMLINUX_H="${RPM_VMLINUX_H}" install
# Restore the original level of source fortification
%define _fortify_level %{_fortify_level_bak}
export CFLAGS="%{build_cflags}"
%ifarch %{klptestarches}
# kernel livepatching selftest test_modules will build against
@ -3243,6 +3254,15 @@ for dir in bpf bpf/no_alu32 bpf/progs; do
done
%buildroot_save_unstripped "usr/libexec/kselftests/bpf/test_progs"
%buildroot_save_unstripped "usr/libexec/kselftests/bpf/test_progs-no_alu32"
# The urandom_read binary doesn't pass the check-rpaths check and upstream
# refuses to fix it. So, we save it to buildroot_unstripped and delete it so it
# will be hidden from check-rpaths and will automatically get restored later.
%buildroot_save_unstripped "usr/libexec/kselftests/bpf/urandom_read"
%buildroot_save_unstripped "usr/libexec/kselftests/bpf/no_alu32/urandom_read"
rm -f %{buildroot}/usr/libexec/kselftests/bpf/urandom_read
rm -f %{buildroot}/usr/libexec/kselftests/bpf/no_alu32/urandom_read
popd
export -n BPFTOOL
%{log_msg "end build selftests"}
@ -4270,6 +4290,17 @@ fi\
#
#
%changelog
* Mon Dec 02 2024 Jan Stancek <jstancek@redhat.com> [6.12.0-32.el10]
- selftests/bpf: Remove ksyms_weak_lskel test (Artem Savkov) [RHEL-48593]
- redhat/spec: Add libxml2-devel dependency for selftests build (Viktor Malik) [RHEL-48593]
- redhat/spec: Bypass check-rpaths for kselftests/bpf/urandom_read (Viktor Malik) [RHEL-48593]
- redhat/spec: Do not use source fortification for selftests (Viktor Malik) [RHEL-48593]
- redhat/spec: Fix BPF selftests build with PIE (Viktor Malik) [RHEL-48593]
- redhat/spec: Add EXTRA_CXXFLAGS to bpf samples and selftests make (Artem Savkov) [RHEL-48593]
- selftests/bpf: Allow building with extra flags (Viktor Malik) [RHEL-48593]
- selftests/bpf: Disable warnings on unused flags for Clang builds (Viktor Malik) [RHEL-48593]
- bpftool: Prevent setting duplicate _GNU_SOURCE in Makefile (Viktor Malik) [RHEL-48593]
* Mon Nov 25 2024 Jan Stancek <jstancek@redhat.com> [6.12.0-31.el10]
- RHEL-only: mark io_uring tech preview and disable by default (Jeff Moyer) [RHEL-65347]

6
sources
View File

@ -1,5 +1,5 @@
SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd
SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6
SHA512 (linux-6.12.0-31.el10.tar.xz) = d02a04e09ec1f2f962acea2c2efe800b16e059ba8ff1aebcd905c54024772344ac30e652f5e69f82ff9739573877af0f247e751e520d29ea7b7683c658cbc83a
SHA512 (kernel-abi-stablelists-6.12.0-31.el10.tar.xz) = 3d14a27567b4cafbc0a67eae14e1317824c3765df08c0111cd4bf45057e14e1f1f94f6eec021d031ba0b1ff38f12b10d146187bdf2041c7eda469965dede5e7d
SHA512 (kernel-kabi-dw-6.12.0-31.el10.tar.xz) = 8292fda927cfe95394454f01b09b1247f0fa8ca3a0f054a36653b0e26d487f67dae1e02bbcad373f6bbcabea1189d2b536001cd81e70678d5a700894452dc36c
SHA512 (linux-6.12.0-32.el10.tar.xz) = 985e93865928df3e9c85843868edc726919c2d916daf444a7ec14abf650df381a06826c94cc541fc375942ae50a75d51c8d52db4768f0b4a4430d632a9d16de0
SHA512 (kernel-abi-stablelists-6.12.0-32.el10.tar.xz) = 713eb87e1163aad18f237a93e17e3cb335a2042fa32567e8d7429a5f283169f3221e6cb739369f793257473a1bdc196843aba696ca1df8e8ebcccc7be7992ba9
SHA512 (kernel-kabi-dw-6.12.0-32.el10.tar.xz) = 89d207b0d3fa865b7174786a97c019a0fafeca6637069b765af569b4cf060b0926f82e9adfc854570c6f3226dfb8aa0aad9b17b923b7fea215270a0614439e9b