From 3d549bf473e9bcd03a7855a0dcfe22731d836e3e Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 1 Dec 2021 11:22:02 -0600 Subject: kernel-5.16-0.rc3.20211201git58e1100fdc59.25 * Wed Dec 01 2021 Fedora Kernel Team [5.16-0.rc3.20211201git58e1100fdc59.25] - redhat/configs: unset KEXEC_SIG for s390x zfcpdump (Coiby Xu) - spec: Keep .BTF section in modules (Jiri Olsa) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-s390x-zfcpdump-rhel.config | 2 +- kernel.spec | 27 ++++++++++++++++++--------- sources | 6 +++--- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index a44122e22..088890d82 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 24 +RHEL_RELEASE = 25 # # Early y+1 numbering diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index c06b8295f..eedcbe10a 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2589,7 +2589,7 @@ CONFIG_KERNEL_HEADER_TEST=y CONFIG_KEXEC_FILE=y CONFIG_KEXEC_IMAGE_VERIFY_SIG=y # CONFIG_KEXEC_SIG_FORCE is not set -CONFIG_KEXEC_SIG=y +# CONFIG_KEXEC_SIG is not set CONFIG_KEXEC=y # CONFIG_KEYBOARD_ADC is not set # CONFIG_KEYBOARD_ADP5588 is not set diff --git a/kernel.spec b/kernel.spec index 4614f264a..7820ae478 100755 --- a/kernel.spec +++ b/kernel.spec @@ -83,9 +83,9 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 -%global distro_build 0.rc3.24 +%global distro_build 0.rc3.20211201git58e1100fdc59.25 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -130,13 +130,13 @@ Summary: The Linux kernel %define rpmversion 5.16.0 %define patchversion 5.16 -%define pkgrelease 0.rc3.24 +%define pkgrelease 0.rc3.20211201git58e1100fdc59.25 # This is needed to do merge window version magic %define patchlevel 16 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.24%{?buildid}%{?dist} +%define specrelease 0.rc3.20211201git58e1100fdc59.25%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -411,6 +411,11 @@ Summary: The Linux kernel %define with_zfcpdump 0 %endif +# skip BTF in kernel modules for s390x +%ifnarch s390x +%define with_kmod_btf --keep-section '.BTF' +%endif + %if 0%{?fedora} # This is not for Fedora %define with_zfcpdump 0 @@ -682,7 +687,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.16-rc3.tar.xz +Source0: linux-5.16-rc3-51-g58e1100fdc59.tar.xz Source1: Makefile.rhelver @@ -1105,7 +1110,7 @@ AutoReqProv: no\ %description %{?1:%{1}-}debuginfo\ This package provides debug information for package %{name}%{?1:-%{1}}.\ This is required to use SystemTap with %{name}%{?1:-%{1}}-%{KVERREL}.\ -%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*\/usr\/src\/kernels/.*|XXX' -o ignored-debuginfo.list -p '/.*/%%{KVERREL_RE}%{?1:[+]%{1}}/.*|/.*%%{KVERREL_RE}%{?1:\+%{1}}(\.debug)?' -o debuginfo%{?1}.list}\ +%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} %{?with_kmod_btf} -p '.*\/usr\/src\/kernels/.*|XXX' -o ignored-debuginfo.list -p '/.*/%%{KVERREL_RE}%{?1:[+]%{1}}/.*|/.*%%{KVERREL_RE}%{?1:\+%{1}}(\.debug)?' -o debuginfo%{?1}.list}\ %{nil} # @@ -1374,8 +1379,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.16-rc3 -c -mv linux-5.16-rc3 linux-%{KVERREL} +%setup -q -n kernel-5.16-rc3-51-g58e1100fdc59 -c +mv linux-5.16-rc3-51-g58e1100fdc59 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2184,7 +2189,7 @@ InitBuildVars %global perf_build_extra_opts CORESIGHT=1 %endif %global perf_make \ - %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3} + %{__make} %{?make_opts} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?cross_opts} -C tools/perf V=1 NO_PERF_READ_VDSO32=1 NO_PERF_READ_VDSOX32=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_STRLCPY=1 NO_BIONIC=1 LIBBPF_DYNAMIC=1 LIBTRACEEVENT_DYNAMIC=1 %{?perf_build_extra_opts} prefix=%{_prefix} PYTHON=%{__python3} %if %{with_perf} # perf # make sure check-headers.sh is executable @@ -2972,6 +2977,10 @@ fi # # %changelog +* Wed Dec 01 2021 Fedora Kernel Team [5.16-0.rc3.20211201git58e1100fdc59.25] +- redhat/configs: unset KEXEC_SIG for s390x zfcpdump (Coiby Xu) +- spec: Keep .BTF section in modules (Jiri Olsa) + * Wed Nov 24 2021 Fedora Kernel Team [5.16-0.rc2.20211124git5d9f4cf36721.19] - Fix up PREEMPT configs (Justin M. Forbes) - New configs in drivers/media (Fedora Kernel Team) diff --git a/sources b/sources index b920342d5..69c0c0ec2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.16-rc3.tar.xz) = 1db26fd17ff6e3400abff5ad739eb08ba4bf3a812e2c37aca8083dd913aab4d857ac66edf95c55cb9f4a52b4d209ff824c4c2609eaf1a4263e33080f36c7cc90 -SHA512 (kernel-abi-stablelists-5.16.0-0.rc3.24.tar.bz2) = fc20d485472024b9d7a7e3c433f9bcce0f1fb749856c9b2d3632270b88bdaa3fd2a667e6dc70dbd3fa13a23fc64fbfc9701e077a4dd3a6bb5869de2378c8033a -SHA512 (kernel-kabi-dw-5.16.0-0.rc3.24.tar.bz2) = 8151ab931514345c056df3a3e5a86092193af0a848cafc648089652bef544c41809f055cab111d11fc49b9edbb650fc0fbc25f317b7aef564384ccaff3431231 +SHA512 (linux-5.16-rc3-51-g58e1100fdc59.tar.xz) = 13a4d0f39631f2ae3c3d09a7a736c865a6331b6cd60df42f68c9855cd8726292423bc751f6a6a088145f5d19acd9c6d60fe5fc7c3de2f626220135e0dee4c1d7 +SHA512 (kernel-abi-stablelists-5.16.0-0.rc3.20211201git58e1100fdc59.25.tar.bz2) = b10015629e59a85809864be0eef00a943c16609b57ec0fc9c9efc4cf0633e51de911dadd280fb094c1eff487878f101b7b74e63f8a7305640b6179388fbea502 +SHA512 (kernel-kabi-dw-5.16.0-0.rc3.20211201git58e1100fdc59.25.tar.bz2) = b6bb5adb90fc17bab86e467e45ba120b0a77e4f6431334af7029b96969cfb8bcb6b9d35ebcd032bceedfba9e6cef297799ea28f2757ac8e48b8f56cf95fffc5e -- cgit