diff options
-rw-r--r-- | kernel-aarch64-debug-rhel.config | 1 | ||||
-rw-r--r-- | kernel-aarch64-rhel.config | 1 | ||||
-rw-r--r-- | kernel-i686-debug-fedora.config | 1 | ||||
-rw-r--r-- | kernel-i686-fedora.config | 1 | ||||
-rw-r--r-- | kernel-ppc64le-debug-rhel.config | 1 | ||||
-rw-r--r-- | kernel-ppc64le-rhel.config | 1 | ||||
-rw-r--r-- | kernel-s390x-debug-rhel.config | 1 | ||||
-rw-r--r-- | kernel-s390x-rhel.config | 1 | ||||
-rw-r--r-- | kernel-s390x-zfcpdump-rhel.config | 1 | ||||
-rw-r--r-- | kernel-x86_64-debug-fedora.config | 1 | ||||
-rw-r--r-- | kernel-x86_64-debug-rhel.config | 1 | ||||
-rw-r--r-- | kernel-x86_64-fedora.config | 2 | ||||
-rw-r--r-- | kernel-x86_64-rhel.config | 1 | ||||
-rwxr-xr-x | kernel.spec | 40 | ||||
-rw-r--r-- | redhatsecureboot301.cer | bin | 0 -> 899 bytes | |||
-rw-r--r-- | redhatsecureboot501.cer | bin | 0 -> 964 bytes | |||
-rw-r--r-- | redhatsecurebootca1.cer | bin | 0 -> 977 bytes | |||
-rw-r--r-- | redhatsecurebootca5.cer | bin | 0 -> 920 bytes | |||
-rw-r--r-- | secureboot_ppc.cer | bin | 0 -> 899 bytes | |||
-rw-r--r-- | secureboot_s390.cer | bin | 0 -> 899 bytes | |||
-rw-r--r-- | sources | 3 |
21 files changed, 38 insertions, 19 deletions
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index e0969c6d7..589b70aa9 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -4450,6 +4450,7 @@ CONFIG_RETPOLINE=y CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +CONFIG_RH_DISABLE_DEPRECATED=y CONFIG_RHEL_DIFFERENCES=y CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 052c051bf..d0c95d07e 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -4428,6 +4428,7 @@ CONFIG_RETPOLINE=y CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +CONFIG_RH_DISABLE_DEPRECATED=y CONFIG_RHEL_DIFFERENCES=y CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index e400a9041..670ef174b 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -5073,6 +5073,7 @@ CONFIG_RETPOLINE=y CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +# CONFIG_RH_DISABLE_DEPRECATED is not set # CONFIG_RHEL_DIFFERENCES is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 07c4f0a60..6d710fe3d 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -5050,6 +5050,7 @@ CONFIG_RETPOLINE=y CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +# CONFIG_RH_DISABLE_DEPRECATED is not set # CONFIG_RHEL_DIFFERENCES is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 5f23da07f..00b13b67a 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -4246,6 +4246,7 @@ CONFIG_RETPOLINE=y # CONFIG_RFKILL_GPIO is not set CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +CONFIG_RH_DISABLE_DEPRECATED=y CONFIG_RHEL_DIFFERENCES=y CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 1dfce96fc..4b2dc877f 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -4228,6 +4228,7 @@ CONFIG_RETPOLINE=y # CONFIG_RFKILL_GPIO is not set CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +CONFIG_RH_DISABLE_DEPRECATED=y CONFIG_RHEL_DIFFERENCES=y CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index ff9114564..463ee90b9 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -4185,6 +4185,7 @@ CONFIG_RETPOLINE=y # CONFIG_RFKILL_GPIO is not set CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +CONFIG_RH_DISABLE_DEPRECATED=y CONFIG_RHEL_DIFFERENCES=y CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index fc7f89263..bbe55dec8 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -4167,6 +4167,7 @@ CONFIG_RETPOLINE=y # CONFIG_RFKILL_GPIO is not set CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +CONFIG_RH_DISABLE_DEPRECATED=y CONFIG_RHEL_DIFFERENCES=y CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index da7e6865c..527f03eae 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -4184,6 +4184,7 @@ CONFIG_RETPOLINE=y # CONFIG_RFKILL_GPIO is not set CONFIG_RFKILL_INPUT=y # CONFIG_RFKILL is not set +CONFIG_RH_DISABLE_DEPRECATED=y CONFIG_RHEL_DIFFERENCES=y CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 4f57a258f..27472f1bb 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5117,6 +5117,7 @@ CONFIG_RETPOLINE=y CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +# CONFIG_RH_DISABLE_DEPRECATED is not set # CONFIG_RHEL_DIFFERENCES is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 286e11c13..f4469d5c0 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -4410,6 +4410,7 @@ CONFIG_RETPOLINE=y # CONFIG_RFKILL_GPIO is not set CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +CONFIG_RH_DISABLE_DEPRECATED=y CONFIG_RHEL_DIFFERENCES=y CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 28f6df87f..3dc383cc8 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1213,7 +1213,7 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_GPIO is not set # CONFIG_DEBUG_HIGHMEM is not set # CONFIG_DEBUG_HOTPLUG_CPU0 is not set -CONFIG_DEBUG_INFO_BTF=y +# CONFIG_DEBUG_INFO_BTF is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 842f45354..5ac10212c 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -4389,6 +4389,7 @@ CONFIG_RETPOLINE=y # CONFIG_RFKILL_GPIO is not set CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m +CONFIG_RH_DISABLE_DEPRECATED=y CONFIG_RHEL_DIFFERENCES=y CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set diff --git a/kernel.spec b/kernel.spec index f60fb38ce..bc9525815 100755 --- a/kernel.spec +++ b/kernel.spec @@ -77,7 +77,7 @@ Summary: The Linux kernel # kernel release. (This includes prepatch or "rc" releases.) # Set released_kernel to 0 when the upstream source tarball contains an # unreleased kernel development snapshot. -%global released_kernel 0 +%global released_kernel 1 # Set debugbuildsenabled to 1 to build separate base and debug kernels # (on supported architectures). The kernel-debug-* subpackages will @@ -119,6 +119,8 @@ Summary: The Linux kernel %endif # define buildid .local +%define packager Thorsten Leemhuis https://fedoraproject.org/wiki/Kernel_Vanilla_Repositories +%define buildid .vanilla.1 %if 0%{?fedora} @@ -126,19 +128,21 @@ Summary: The Linux kernel %else %define primary_target rhel %endif +%define fedorabase 5.16.0 + # The kernel tarball/base version %define kversion 5.16 -%define rpmversion 5.16.0 +%define rpmversion 5.16.1 %define patchversion 5.16 -%define pkgrelease 60 +%define pkgrelease 60.1 # This is needed to do merge window version magic %define patchlevel 16 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 60%{?buildid}%{?dist} +%define specrelease 60.1%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -155,7 +159,7 @@ Summary: The Linux kernel # kernel PAE (only valid for ARM (lpae)) %define with_pae %{?_without_pae: 0} %{?!_without_pae: 1} # kernel-debug -%define with_debug %{?_without_debug: 0} %{?!_without_debug: 1} +%define with_debug %{?_with_debug: 1} %{?!_with_debug: 0} # kernel-zfcpdump (s390 specific kernel for zfcpdump) %define with_zfcpdump %{?_without_zfcpdump: 0} %{?!_without_zfcpdump: 1} # kernel-doc @@ -206,7 +210,7 @@ Summary: The Linux kernel %define with_cross %{?_with_cross: 1} %{?!_with_cross: 0} # # build a release kernel on rawhide -%define with_release %{?_with_release: 1} %{?!_with_release: 0} +%define with_release %{?_without_release: 0} %{?!_without_release: 1} # verbose build, i.e. no silent rules and V=1 %define with_verbose %{?_with_verbose: 1} %{?!_with_verbose: 0} @@ -224,7 +228,7 @@ Summary: The Linux kernel %define with_ipaclones %{?_without_ipaclones: 0} %{?!_without_ipaclones: 1} # Want to build a vanilla kernel build without any non-upstream patches? -%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0} +%define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1} %if 0%{?fedora} # Kernel headers are being split out into a separate package @@ -643,7 +647,7 @@ BuildConflicts: dwarves < 1.13 %undefine _debugsource_packages %undefine _debuginfo_subpackages %global _find_debuginfo_opts -r -%global _missing_build_ids_terminate_build 1 +%global _missing_build_ids_terminate_build 0 %global _no_recompute_build_ids 1 %endif %if %{with_kabidwchk} || %{with_kabidw_base} @@ -689,7 +693,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.16.tar.xz +Source0: linux-5.16.1.tar.xz Source1: Makefile.rhelver @@ -828,8 +832,8 @@ Source211: Module.kabi_dup_ppc64le Source212: Module.kabi_dup_s390x Source213: Module.kabi_dup_x86_64 -Source300: kernel-abi-stablelists-%{rpmversion}-%{distro_build}.tar.bz2 -Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2 +Source300: kernel-abi-stablelists-%{fedorabase}-%{distro_build}.tar.bz2 +Source301: kernel-kabi-dw-%{fedorabase}-%{distro_build}.tar.bz2 # Sources for kernel-tools Source2000: cpupower.service @@ -1383,11 +1387,11 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.16 -c -mv linux-5.16 linux-%{KVERREL} +%setup -q -n kernel-5.16.1 -c +mv linux-5.16.1 linux-%{KVERREL} cd linux-%{KVERREL} -cp -a %{SOURCE1} . +# cp -a %{SOURCE1} . %if !%{nopatches} @@ -1398,6 +1402,8 @@ ApplyOptionalPatch linux-kernel-test.patch # END OF PATCH APPLICATIONS +head Makefile + # Any further pre-build tree manipulations happen here. chmod +x scripts/checkpatch.pl @@ -2110,7 +2116,11 @@ BuildKernel() { %ifnarch armv7hl # Generate vmlinux.h and put it to kernel-devel path - bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/vmlinux.h + + # tmp disabled for vanilla builds, as it fails on x86_64 with + # "Error: failed to load BTF from vmlinux: No such file or directory" + # (and yes, the file exists) + # bpftool btf dump file vmlinux format c > $RPM_BUILD_ROOT/$DevelDir/vmlinux.h %endif # prune junk from kernel-devel diff --git a/redhatsecureboot301.cer b/redhatsecureboot301.cer Binary files differnew file mode 100644 index 000000000..20e660479 --- /dev/null +++ b/redhatsecureboot301.cer diff --git a/redhatsecureboot501.cer b/redhatsecureboot501.cer Binary files differnew file mode 100644 index 000000000..dfa7afb46 --- /dev/null +++ b/redhatsecureboot501.cer diff --git a/redhatsecurebootca1.cer b/redhatsecurebootca1.cer Binary files differnew file mode 100644 index 000000000..b2354007b --- /dev/null +++ b/redhatsecurebootca1.cer diff --git a/redhatsecurebootca5.cer b/redhatsecurebootca5.cer Binary files differnew file mode 100644 index 000000000..dfb028495 --- /dev/null +++ b/redhatsecurebootca5.cer diff --git a/secureboot_ppc.cer b/secureboot_ppc.cer Binary files differnew file mode 100644 index 000000000..2c0087dbc --- /dev/null +++ b/secureboot_ppc.cer diff --git a/secureboot_s390.cer b/secureboot_s390.cer Binary files differnew file mode 100644 index 000000000..137d3858f --- /dev/null +++ b/secureboot_s390.cer @@ -1,3 +0,0 @@ -SHA512 (linux-5.16.tar.xz) = 7872f4296c9ee86157a70cc8c808d52dadfe9d91d0540e3a5054e21fd6d27a499cb5b05ad146361ed2d80ba24feb38ab0210fb9e484a20055f46835db7da3f5e -SHA512 (kernel-abi-stablelists-5.16.0-60.tar.bz2) = d154ad50cc3326a971988755403ade56d4db7363adc94b6f1ae137749a80a177acd830153e2034fdf3b35feff1ee166d3c17b31ad3451e5d5503b35ee48048e3 -SHA512 (kernel-kabi-dw-5.16.0-60.tar.bz2) = 2fe56d0ea720e1bac1406f73a44c5de41c822bace7bd3afeae27706d2a5fd4697f9d45d1809b5d24056ee5c00c5511735931c1819be2b94649df9cdf25562a19 |