diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index afe5f108f..0d80e5980 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1608,8 +1608,8 @@ CONFIG_DEBUG_HIGHMEM=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set -# CONFIG_DEBUG_INFO_COMPRESSED_NONE is not set -CONFIG_DEBUG_INFO_COMPRESSED_ZLIB=y +CONFIG_DEBUG_INFO_COMPRESSED_NONE=y +# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 297f6909e..0840683a9 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1608,8 +1608,8 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set -# CONFIG_DEBUG_INFO_COMPRESSED_NONE is not set -CONFIG_DEBUG_INFO_COMPRESSED_ZLIB=y +CONFIG_DEBUG_INFO_COMPRESSED_NONE=y +# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index c2e7338e5..a3cdc454f 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -1566,8 +1566,8 @@ CONFIG_DEBUG_HIGHMEM=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_INFO_BTF is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set -# CONFIG_DEBUG_INFO_COMPRESSED_NONE is not set -CONFIG_DEBUG_INFO_COMPRESSED_ZLIB=y +CONFIG_DEBUG_INFO_COMPRESSED_NONE=y +# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index c9a5b50fd..25a59b9f0 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -1566,8 +1566,8 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_INFO_BTF is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set -# CONFIG_DEBUG_INFO_COMPRESSED_NONE is not set -CONFIG_DEBUG_INFO_COMPRESSED_ZLIB=y +CONFIG_DEBUG_INFO_COMPRESSED_NONE=y +# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index e12041714..3e73c9021 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -1535,8 +1535,8 @@ CONFIG_DEBUG_HIGHMEM=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_INFO_BTF is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set -# CONFIG_DEBUG_INFO_COMPRESSED_NONE is not set -CONFIG_DEBUG_INFO_COMPRESSED_ZLIB=y +CONFIG_DEBUG_INFO_COMPRESSED_NONE=y +# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 8850cd39f..69353c943 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -1535,8 +1535,8 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set # CONFIG_DEBUG_INFO_BTF is not set # CONFIG_DEBUG_INFO_COMPRESSED is not set -# CONFIG_DEBUG_INFO_COMPRESSED_NONE is not set -CONFIG_DEBUG_INFO_COMPRESSED_ZLIB=y +CONFIG_DEBUG_INFO_COMPRESSED_NONE=y +# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 1d21e60ea..8cbf34515 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1207,8 +1207,8 @@ CONFIG_DEBUG_HIGHMEM=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set -# CONFIG_DEBUG_INFO_COMPRESSED_NONE is not set -CONFIG_DEBUG_INFO_COMPRESSED_ZLIB=y +CONFIG_DEBUG_INFO_COMPRESSED_NONE=y +# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 34fc25fcf..cfbb8d7ab 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1206,8 +1206,8 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set -# CONFIG_DEBUG_INFO_COMPRESSED_NONE is not set -CONFIG_DEBUG_INFO_COMPRESSED_ZLIB=y +CONFIG_DEBUG_INFO_COMPRESSED_NONE=y +# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 08e674875..34fdd5988 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -1301,8 +1301,8 @@ CONFIG_DEBUG_HIGHMEM=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set -# CONFIG_DEBUG_INFO_COMPRESSED_NONE is not set -CONFIG_DEBUG_INFO_COMPRESSED_ZLIB=y +CONFIG_DEBUG_INFO_COMPRESSED_NONE=y +# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 1dc15632f..cc6bca987 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1300,8 +1300,8 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_HOTPLUG_CPU0 is not set CONFIG_DEBUG_INFO_BTF=y # CONFIG_DEBUG_INFO_COMPRESSED is not set -# CONFIG_DEBUG_INFO_COMPRESSED_NONE is not set -CONFIG_DEBUG_INFO_COMPRESSED_ZLIB=y +CONFIG_DEBUG_INFO_COMPRESSED_NONE=y +# CONFIG_DEBUG_INFO_COMPRESSED_ZLIB is not set # CONFIG_DEBUG_INFO_COMPRESSED_ZSTD is not set # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_DWARF5 is not set diff --git a/kernel.spec b/kernel.spec index 1f96817e7..ea387edad 100755 --- a/kernel.spec +++ b/kernel.spec @@ -145,17 +145,17 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specversion 6.2.1 +%define specversion 6.2.2 %define patchversion 6.2 %define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.2.1 +%define tarfile_release 6.2.2 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.2.1 +%define kabiversion 6.2.2 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -726,7 +726,11 @@ BuildRequires: dracut BuildRequires: binutils # For the initrd BuildRequires: lvm2 +%if 0%{?fedora} > 37 +# The UKI code was introduced in Fedora 38 and is not needed by +# earlier versions. This wrapper can be removed in Fedora 41. BuildRequires: systemd-boot-unsigned +%endif # For systemd-stub and systemd-pcrphase BuildRequires: systemd-udev >= 252-1 # For TPM operations in UKI initramfs @@ -3343,6 +3347,13 @@ fi # # %changelog +* Fri Mar 03 2023 Justin M. Forbes [6.2.2-300] +- redhat/kernel.spec.template: Fix RHEL systemd-boot-unsigned dependency (Prarit Bhargava) + +* Fri Mar 03 2023 Justin M. Forbes [6.2.2-0] +- Turn off DEBUG_INFO_COMPRESSED_ZLIB for Fedora (Justin M. Forbes) +- Linux v6.2.2 + * Sat Feb 25 2023 Justin M. Forbes [6.2.1-0] - Add UKI revert patch to allow builds on F36 and F37 (Justin M. Forbes) - Turn E1000 back on (Justin M. Forbes) diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch index 01cef62b5..28280a683 100644 --- a/patch-6.2-redhat.patch +++ b/patch-6.2-redhat.patch @@ -36,7 +36,7 @@ 35 files changed, 980 insertions(+), 177 deletions(-) diff --git a/Makefile b/Makefile -index f26824f367a9..540a8364178e 100644 +index 1836ddaf2c94..eb1d58681256 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1011,10 +1011,10 @@ index 285acc4aaccc..a7056957e7dd 100644 * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) * class code. Fix it. diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 9eca403af2a8..ebe803d4ad4d 100644 +index 97a0f8faea6e..d837548d2024 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5735,6 +5735,13 @@ static void hub_event(struct work_struct *work) +@@ -5734,6 +5734,13 @@ static void hub_event(struct work_struct *work) (u16) hub->change_bits[0], (u16) hub->event_bits[0]); @@ -1706,7 +1706,7 @@ index a2ff4242e623..f0d2be1ee4f1 100644 int module_sig_check(struct load_info *info, int flags) diff --git a/scripts/tags.sh b/scripts/tags.sh -index e137cf15aae9..2ed2341f7967 100755 +index 0d045182c08c..8606325b0ec2 100755 --- a/scripts/tags.sh +++ b/scripts/tags.sh @@ -16,6 +16,8 @@ fi diff --git a/sources b/sources index ead7687ba..891330869 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.2.1.tar.xz) = 898974720565ef2423c1a8b74575e48280a1939418a1018443bb89bea81c5654b7034ab4eb58d5ae8c364aa6ae86b5d632df3976ccd2279f07ae06db60528ecf -SHA512 (kernel-abi-stablelists-6.2.1.tar.bz2) = efd5f2ec8ca2a3cdca76d5003c3ddaf704f2673dba865c876835ad241f3e681198453f2f60ff45094377a55380ba1132e12499251f8829588fff03c976b91a86 -SHA512 (kernel-kabi-dw-6.2.1.tar.bz2) = 221c668cffd283f69df51282dbfcf923f1be8cf12d8b094892da4aa8995a900fc7a0494e962322383f3069acf4beba0d8fbcb98c36342cf3e34be9614337c40a +SHA512 (linux-6.2.2.tar.xz) = 155b0e21bde6f1cc6d410e588ca120cee6b4b056079e43d1b090a3e707859b5bf538ce2736d7cfc4f1455b9042a09ed5b1b37182e879264fed74c7913f253830 +SHA512 (kernel-abi-stablelists-6.2.2.tar.bz2) = e1e92d3807b2aefb7ac69b637ff9a9ceed9ed76e8eddbfc2a3035cb35a1fce81b64e7a3c44fe12df85f93861111c40cbb521fea53c70ca287224dfddc62d5d2b +SHA512 (kernel-kabi-dw-6.2.2.tar.bz2) = d6b74c79ec7d45a7b27c47b888078fe4275e04f04b27970217828a884c48bb5f795435fa70a6b8b7dc802f1d94a80af272b53d122b892cda0ba1d803853f755a