diff options
23 files changed, 34 insertions, 29 deletions
diff --git a/SOURCES/kernel-aarch64-debug-fedora.config b/SOURCES/kernel-aarch64-debug-fedora.config index f87bc2d..6ce3963 100644 --- a/SOURCES/kernel-aarch64-debug-fedora.config +++ b/SOURCES/kernel-aarch64-debug-fedora.config @@ -2190,7 +2190,7 @@ CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI=y -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set CONFIG_EMAC_ROCKCHIP=m # CONFIG_EMBEDDED is not set diff --git a/SOURCES/kernel-aarch64-debug-rhel.config b/SOURCES/kernel-aarch64-debug-rhel.config index 356ddf2..1bc757a 100644 --- a/SOURCES/kernel-aarch64-debug-rhel.config +++ b/SOURCES/kernel-aarch64-debug-rhel.config @@ -1694,7 +1694,7 @@ CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI=y -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/SOURCES/kernel-aarch64-fedora.config b/SOURCES/kernel-aarch64-fedora.config index 776dec9..ca2002e 100644 --- a/SOURCES/kernel-aarch64-fedora.config +++ b/SOURCES/kernel-aarch64-fedora.config @@ -2182,7 +2182,7 @@ CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI=y -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set CONFIG_EMAC_ROCKCHIP=m # CONFIG_EMBEDDED is not set diff --git a/SOURCES/kernel-aarch64-rhel.config b/SOURCES/kernel-aarch64-rhel.config index df10b2c..5824cbd 100644 --- a/SOURCES/kernel-aarch64-rhel.config +++ b/SOURCES/kernel-aarch64-rhel.config @@ -1686,7 +1686,7 @@ CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI=y -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/SOURCES/kernel-armv7hl-debug-fedora.config b/SOURCES/kernel-armv7hl-debug-fedora.config index 0ea4425..25fc9a5 100644 --- a/SOURCES/kernel-armv7hl-debug-fedora.config +++ b/SOURCES/kernel-armv7hl-debug-fedora.config @@ -2181,7 +2181,7 @@ CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI=y -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set CONFIG_EMAC_ROCKCHIP=m # CONFIG_EMBEDDED is not set diff --git a/SOURCES/kernel-armv7hl-fedora.config b/SOURCES/kernel-armv7hl-fedora.config index 2572d31..cc553ea 100644 --- a/SOURCES/kernel-armv7hl-fedora.config +++ b/SOURCES/kernel-armv7hl-fedora.config @@ -2174,7 +2174,7 @@ CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI=y -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set CONFIG_EMAC_ROCKCHIP=m # CONFIG_EMBEDDED is not set diff --git a/SOURCES/kernel-armv7hl-lpae-debug-fedora.config b/SOURCES/kernel-armv7hl-lpae-debug-fedora.config index 05488c0..6bfcd6d 100644 --- a/SOURCES/kernel-armv7hl-lpae-debug-fedora.config +++ b/SOURCES/kernel-armv7hl-lpae-debug-fedora.config @@ -2135,7 +2135,7 @@ CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI=y -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set CONFIG_EMAC_ROCKCHIP=m # CONFIG_EMBEDDED is not set diff --git a/SOURCES/kernel-armv7hl-lpae-fedora.config b/SOURCES/kernel-armv7hl-lpae-fedora.config index 2dda202..b4e1626 100644 --- a/SOURCES/kernel-armv7hl-lpae-fedora.config +++ b/SOURCES/kernel-armv7hl-lpae-fedora.config @@ -2128,7 +2128,7 @@ CONFIG_EFIVAR_FS=y CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI=y -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set CONFIG_EMAC_ROCKCHIP=m # CONFIG_EMBEDDED is not set diff --git a/SOURCES/kernel-ppc64le-debug-fedora.config b/SOURCES/kernel-ppc64le-debug-fedora.config index 7c4d65d..ca453d7 100644 --- a/SOURCES/kernel-ppc64le-debug-fedora.config +++ b/SOURCES/kernel-ppc64le-debug-fedora.config @@ -1692,7 +1692,7 @@ CONFIG_EFI_SECRET=m CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y CONFIG_EFI_TEST=m -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EMBEDDED is not set # CONFIG_ENA_ETHERNET is not set diff --git a/SOURCES/kernel-ppc64le-debug-rhel.config b/SOURCES/kernel-ppc64le-debug-rhel.config index 0c3e388..8942e9c 100644 --- a/SOURCES/kernel-ppc64le-debug-rhel.config +++ b/SOURCES/kernel-ppc64le-debug-rhel.config @@ -1513,7 +1513,7 @@ CONFIG_EFI_PARTITION=y CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y # CONFIG_EFI_TEST is not set -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/SOURCES/kernel-ppc64le-fedora.config b/SOURCES/kernel-ppc64le-fedora.config index cb6aac0..97eda7b 100644 --- a/SOURCES/kernel-ppc64le-fedora.config +++ b/SOURCES/kernel-ppc64le-fedora.config @@ -1683,7 +1683,7 @@ CONFIG_EFI_SECRET=m CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y CONFIG_EFI_TEST=m -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EMBEDDED is not set # CONFIG_ENA_ETHERNET is not set diff --git a/SOURCES/kernel-ppc64le-rhel.config b/SOURCES/kernel-ppc64le-rhel.config index 2283801..e3d1dd5 100644 --- a/SOURCES/kernel-ppc64le-rhel.config +++ b/SOURCES/kernel-ppc64le-rhel.config @@ -1505,7 +1505,7 @@ CONFIG_EFI_PARTITION=y CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y # CONFIG_EFI_TEST is not set -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/SOURCES/kernel-s390x-debug-fedora.config b/SOURCES/kernel-s390x-debug-fedora.config index 1e49fc1..03e29ab 100644 --- a/SOURCES/kernel-s390x-debug-fedora.config +++ b/SOURCES/kernel-s390x-debug-fedora.config @@ -1697,7 +1697,7 @@ CONFIG_EFI_SECRET=m CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y CONFIG_EFI_TEST=m -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EMBEDDED is not set # CONFIG_ENA_ETHERNET is not set diff --git a/SOURCES/kernel-s390x-debug-rhel.config b/SOURCES/kernel-s390x-debug-rhel.config index 78e33b4..c0f3b97 100644 --- a/SOURCES/kernel-s390x-debug-rhel.config +++ b/SOURCES/kernel-s390x-debug-rhel.config @@ -1517,7 +1517,7 @@ CONFIG_EFI_PARTITION=y CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y # CONFIG_EFI_TEST is not set -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/SOURCES/kernel-s390x-fedora.config b/SOURCES/kernel-s390x-fedora.config index 5bddfb7..876b490 100644 --- a/SOURCES/kernel-s390x-fedora.config +++ b/SOURCES/kernel-s390x-fedora.config @@ -1688,7 +1688,7 @@ CONFIG_EFI_SECRET=m CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y CONFIG_EFI_TEST=m -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EMBEDDED is not set # CONFIG_ENA_ETHERNET is not set diff --git a/SOURCES/kernel-s390x-rhel.config b/SOURCES/kernel-s390x-rhel.config index 6dcdc34..08ccfe1 100644 --- a/SOURCES/kernel-s390x-rhel.config +++ b/SOURCES/kernel-s390x-rhel.config @@ -1509,7 +1509,7 @@ CONFIG_EFI_PARTITION=y CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y # CONFIG_EFI_TEST is not set -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/SOURCES/kernel-s390x-zfcpdump-rhel.config b/SOURCES/kernel-s390x-zfcpdump-rhel.config index 6cbc939..aeb74ea 100644 --- a/SOURCES/kernel-s390x-zfcpdump-rhel.config +++ b/SOURCES/kernel-s390x-zfcpdump-rhel.config @@ -1514,7 +1514,7 @@ CONFIG_EFI_PARTITION=y CONFIG_EFI_SOFT_RESERVE=y CONFIG_EFI_STUB=y # CONFIG_EFI_TEST is not set -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EISA is not set CONFIG_ELF_CORE=y diff --git a/SOURCES/kernel-x86_64-debug-fedora.config b/SOURCES/kernel-x86_64-debug-fedora.config index bb20995..200ccd6 100644 --- a/SOURCES/kernel-x86_64-debug-fedora.config +++ b/SOURCES/kernel-x86_64-debug-fedora.config @@ -1856,7 +1856,7 @@ CONFIG_EFIVAR_FS=y # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set # CONFIG_EFI_VARS_PSTORE is not set CONFIG_EFI=y -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/SOURCES/kernel-x86_64-debug-rhel.config b/SOURCES/kernel-x86_64-debug-rhel.config index e14cadf..8346088 100644 --- a/SOURCES/kernel-x86_64-debug-rhel.config +++ b/SOURCES/kernel-x86_64-debug-rhel.config @@ -1619,7 +1619,7 @@ CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI_VARS=y CONFIG_EFI=y -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/SOURCES/kernel-x86_64-fedora.config b/SOURCES/kernel-x86_64-fedora.config index b366096..46f4f38 100644 --- a/SOURCES/kernel-x86_64-fedora.config +++ b/SOURCES/kernel-x86_64-fedora.config @@ -1847,7 +1847,7 @@ CONFIG_EFIVAR_FS=y # CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set # CONFIG_EFI_VARS_PSTORE is not set CONFIG_EFI=y -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/SOURCES/kernel-x86_64-rhel.config b/SOURCES/kernel-x86_64-rhel.config index 2e4ca10..f393c33 100644 --- a/SOURCES/kernel-x86_64-rhel.config +++ b/SOURCES/kernel-x86_64-rhel.config @@ -1611,7 +1611,7 @@ CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_VARS_PSTORE=y CONFIG_EFI_VARS=y CONFIG_EFI=y -CONFIG_EFI_ZBOOT=y +# CONFIG_EFI_ZBOOT is not set # CONFIG_EFS_FS is not set # CONFIG_EISA is not set # CONFIG_EMBEDDED is not set diff --git a/SOURCES/patch-6.2-redhat.patch b/SOURCES/patch-6.2-redhat.patch index 217aa22..c7028a5 100644 --- a/SOURCES/patch-6.2-redhat.patch +++ b/SOURCES/patch-6.2-redhat.patch @@ -123,7 +123,7 @@ index 000000000000..1b2a1baa26f9 + +... diff --git a/Makefile b/Makefile -index 416490daa76a..f65904d89130 100644 +index 068374cc2601..ae60a40c82ec 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index fdae550..47ee1e7 100755 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -148,17 +148,17 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 %define buildid .fsync -%define specversion 6.2.11 +%define specversion 6.2.12 %define patchversion 6.2 %define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.2.11 +%define tarfile_release 6.2.12 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 301%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.2.11 +%define kabiversion 6.2.12 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -502,8 +502,8 @@ Summary: The Linux kernel %define all_arch_configs kernel-%{version}-aarch64*.config %define asmarch arm64 %define hdrarch arm64 -%define make_target vmlinuz.efi -%define kernel_image arch/arm64/boot/vmlinuz.efi +%define make_target Image.gz +%define kernel_image arch/arm64/boot/Image.gz %endif # Should make listnewconfig fail if there's config options @@ -3388,8 +3388,13 @@ fi # # %changelog -* Wed Apr 19 2023 Jan Drögehoff <sentrycraft123@gmail.com> - 6.2.11-301.1 -- kernel-fsync v6.2.11 +* Mon Apr 24 2023 Jan Drögehoff <sentrycraft123@gmail.com> - 6.2.12-301.fsync +- kernel-fsync v6.2.12 + +* Thu Apr 20 2023 Augusto Caringi <acaringi@redhat.com> [6.2.12-0] +- Add bugs fixed by 6.2.12 (Justin M. Forbes) +- Use RHJOBS for create-tarball (Don Zickus) +- Linux v6.2.12 * Thu Apr 13 2023 Augusto Caringi <acaringi@redhat.com> [6.2.11-0] - Linux v6.2.11 |