From e9819dd90df306b698e0f489612650493acb5a2f Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 4 Dec 2024 09:43:36 +0300 Subject: [PATCH] import kernel-6.12.0-32.el10 --- .gitignore | 6 +++--- .kernel.metadata | 6 +++--- SOURCES/Makefile.rhelver | 2 +- SOURCES/kernel.changelog | 12 +++++++++++ SPECS/kernel.spec | 45 +++++++++++++++++++++++++++++++++------- 5 files changed, 57 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index bfaa4b8..14efde4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ SOURCES/fedoraimaca.x509 -SOURCES/kernel-abi-stablelists-6.12.0-31.el10.tar.xz -SOURCES/kernel-kabi-dw-6.12.0-31.el10.tar.xz -SOURCES/linux-6.12.0-31.el10.tar.xz +SOURCES/kernel-abi-stablelists-6.12.0-32.el10.tar.xz +SOURCES/kernel-kabi-dw-6.12.0-32.el10.tar.xz +SOURCES/linux-6.12.0-32.el10.tar.xz SOURCES/nvidiagpuoot001.x509 SOURCES/redhatsecureboot501.cer SOURCES/redhatsecurebootca5.cer diff --git a/.kernel.metadata b/.kernel.metadata index f938c6b..c69847c 100644 --- a/.kernel.metadata +++ b/.kernel.metadata @@ -1,7 +1,7 @@ 9b16961bd5da2dc805f1b73414c201d4371613f1 SOURCES/fedoraimaca.x509 -bc6a308dc19cdfca3574af50ffee45804be797be SOURCES/kernel-abi-stablelists-6.12.0-31.el10.tar.xz -10588f85d3073e65f8874cb41ce1e40e434f5e50 SOURCES/kernel-kabi-dw-6.12.0-31.el10.tar.xz -660a35845def4c4f728bd047feda1d02ab3c50de SOURCES/linux-6.12.0-31.el10.tar.xz +2bd9dc95482959a9ff5627ec8a5ce8dd7b2e2e76 SOURCES/kernel-abi-stablelists-6.12.0-32.el10.tar.xz +d31d07ef9b7cbd77a6a43fb713d3cd755dc448ac SOURCES/kernel-kabi-dw-6.12.0-32.el10.tar.xz +409e1d20013b307d925d20bbc7350846ee1e987d SOURCES/linux-6.12.0-32.el10.tar.xz 4fff8080e88afffc06d8ef5004db8d53bb21237f SOURCES/nvidiagpuoot001.x509 ba0b760e594ff668ee72ae348adf3e49b97f75fb SOURCES/redhatsecureboot501.cer e6f506462069aa17d2e8610503635c20f3a995c3 SOURCES/redhatsecurebootca5.cer diff --git a/SOURCES/Makefile.rhelver b/SOURCES/Makefile.rhelver index 0c9781c..97e2f01 100644 --- a/SOURCES/Makefile.rhelver +++ b/SOURCES/Makefile.rhelver @@ -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 diff --git a/SOURCES/kernel.changelog b/SOURCES/kernel.changelog index 6fcac30..bf345ee 100644 --- a/SOURCES/kernel.changelog +++ b/SOURCES/kernel.changelog @@ -1,3 +1,15 @@ +* Mon Dec 02 2024 Jan Stancek [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 [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 diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index f5c5482..8e69565 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -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 [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 [6.12.0-31.el10] - RHEL-only: mark io_uring tech preview and disable by default (Jeff Moyer) [RHEL-65347]