From 10db88dce39460ae36eae6aca8487995a407a5e4 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 23 Sep 2021 13:13:39 -0500 Subject: kernel-5.15-0.rc2.20210923git58e2cf5d7946.21 * Thu Sep 23 2021 Fedora Kernel Team [5.15-0.rc2.20210923git58e2cf5d7946.21] - redhat/configs: enable CONFIG_SQUASHFS_ZSTD which is already enabled in Fedora 34 (Tao Liu) [1998953] Resolves: rhbz#1998953 Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-rhel.config | 2 +- kernel-aarch64-rhel.config | 2 +- kernel-ppc64le-debug-rhel.config | 2 +- kernel-ppc64le-rhel.config | 2 +- kernel-s390x-debug-fedora.config | 2 ++ kernel-s390x-debug-rhel.config | 4 +++- kernel-s390x-fedora.config | 2 ++ kernel-s390x-rhel.config | 4 +++- kernel-s390x-zfcpdump-rhel.config | 16 +++++++++------- kernel-x86_64-debug-rhel.config | 2 +- kernel-x86_64-rhel.config | 2 +- kernel.spec | 15 +++++++++------ sources | 6 +++--- 14 files changed, 38 insertions(+), 25 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 48e74c801..f4c251150 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 = 20 +RHEL_RELEASE = 21 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 6a3cf7d48..a328bd552 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -5954,7 +5954,7 @@ CONFIG_SQUASHFS=m CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_XZ=y CONFIG_SQUASHFS_ZLIB=y -# CONFIG_SQUASHFS_ZSTD is not set +CONFIG_SQUASHFS_ZSTD=y # CONFIG_SRAM is not set # CONFIG_SRF04 is not set # CONFIG_SRF08 is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 8e754ef1a..b57803db3 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -5931,7 +5931,7 @@ CONFIG_SQUASHFS=m CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_XZ=y CONFIG_SQUASHFS_ZLIB=y -# CONFIG_SQUASHFS_ZSTD is not set +CONFIG_SQUASHFS_ZSTD=y # CONFIG_SRAM is not set # CONFIG_SRF04 is not set # CONFIG_SRF08 is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 556c375aa..4d9ed7193 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -5728,7 +5728,7 @@ CONFIG_SQUASHFS=m CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_XZ=y CONFIG_SQUASHFS_ZLIB=y -# CONFIG_SQUASHFS_ZSTD is not set +CONFIG_SQUASHFS_ZSTD=y # CONFIG_SRAM is not set # CONFIG_SRF04 is not set # CONFIG_SRF08 is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index b96f63f7f..7db07774a 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -5709,7 +5709,7 @@ CONFIG_SQUASHFS=m CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_XZ=y CONFIG_SQUASHFS_ZLIB=y -# CONFIG_SQUASHFS_ZSTD is not set +CONFIG_SQUASHFS_ZSTD=y # CONFIG_SRAM is not set # CONFIG_SRF04 is not set # CONFIG_SRF08 is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 2ed5ca1f0..48a2edce0 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -5510,6 +5510,7 @@ CONFIG_SHUFFLE_PAGE_ALLOCATOR=y # CONFIG_SI1145 is not set # CONFIG_SI7005 is not set # CONFIG_SI7020 is not set +CONFIG_SIGNATURE=y CONFIG_SIGNED_PE_FILE_VERIFICATION=y # CONFIG_SIMPLE_PM_BUS is not set # CONFIG_SIOX is not set @@ -6316,6 +6317,7 @@ CONFIG_SYSCTL=y # CONFIG_SYSTEM76_ACPI is not set CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" CONFIG_SYSTEM_BLACKLIST_KEYRING=y +CONFIG_SYSTEM_DATA_VERIFICATION=y CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096 CONFIG_SYSTEM_EXTRA_CERTIFICATE=y # CONFIG_SYSTEMPORT is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index fa74b6808..0ff25afd5 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -4976,6 +4976,7 @@ CONFIG_SHUFFLE_PAGE_ALLOCATOR=y # CONFIG_SI1145 is not set # CONFIG_SI7005 is not set # CONFIG_SI7020 is not set +CONFIG_SIGNATURE=y # CONFIG_SIGNED_PE_FILE_VERIFICATION is not set # CONFIG_SIMPLE_PM_BUS is not set # CONFIG_SIOX is not set @@ -5674,7 +5675,7 @@ CONFIG_SQUASHFS=m CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_XZ=y CONFIG_SQUASHFS_ZLIB=y -# CONFIG_SQUASHFS_ZSTD is not set +CONFIG_SQUASHFS_ZSTD=y # CONFIG_SRAM is not set # CONFIG_SRF04 is not set # CONFIG_SRF08 is not set @@ -5735,6 +5736,7 @@ CONFIG_SYSCTL=y # CONFIG_SYSTEM76_ACPI is not set CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" CONFIG_SYSTEM_BLACKLIST_KEYRING=y +CONFIG_SYSTEM_DATA_VERIFICATION=y # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set # CONFIG_SYSTEMPORT is not set # CONFIG_SYSTEM_REVOCATION_KEYS is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 32eb30e89..e53267df3 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -5487,6 +5487,7 @@ CONFIG_SHUFFLE_PAGE_ALLOCATOR=y # CONFIG_SI1145 is not set # CONFIG_SI7005 is not set # CONFIG_SI7020 is not set +CONFIG_SIGNATURE=y CONFIG_SIGNED_PE_FILE_VERIFICATION=y # CONFIG_SIMPLE_PM_BUS is not set # CONFIG_SIOX is not set @@ -6291,6 +6292,7 @@ CONFIG_SYSCTL=y # CONFIG_SYSTEM76_ACPI is not set CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" CONFIG_SYSTEM_BLACKLIST_KEYRING=y +CONFIG_SYSTEM_DATA_VERIFICATION=y CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096 CONFIG_SYSTEM_EXTRA_CERTIFICATE=y # CONFIG_SYSTEMPORT is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 994803917..be69f1e21 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -4959,6 +4959,7 @@ CONFIG_SHUFFLE_PAGE_ALLOCATOR=y # CONFIG_SI1145 is not set # CONFIG_SI7005 is not set # CONFIG_SI7020 is not set +CONFIG_SIGNATURE=y # CONFIG_SIGNED_PE_FILE_VERIFICATION is not set # CONFIG_SIMPLE_PM_BUS is not set # CONFIG_SIOX is not set @@ -5655,7 +5656,7 @@ CONFIG_SQUASHFS=m CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_XZ=y CONFIG_SQUASHFS_ZLIB=y -# CONFIG_SQUASHFS_ZSTD is not set +CONFIG_SQUASHFS_ZSTD=y # CONFIG_SRAM is not set # CONFIG_SRF04 is not set # CONFIG_SRF08 is not set @@ -5716,6 +5717,7 @@ CONFIG_SYSCTL=y # CONFIG_SYSTEM76_ACPI is not set CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" CONFIG_SYSTEM_BLACKLIST_KEYRING=y +CONFIG_SYSTEM_DATA_VERIFICATION=y # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set # CONFIG_SYSTEMPORT is not set # CONFIG_SYSTEM_REVOCATION_KEYS is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index d39d1d537..1a6f356f0 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2224,10 +2224,10 @@ CONFIG_INPUT_UINPUT=m CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m # CONFIG_INT3406_THERMAL is not set -CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y +# CONFIG_INTEGRITY_ASYMMETRIC_KEYS is not set CONFIG_INTEGRITY_AUDIT=y -CONFIG_INTEGRITY_PLATFORM_KEYRING=y -CONFIG_INTEGRITY_SIGNATURE=y +# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set +# CONFIG_INTEGRITY_SIGNATURE is not set CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set @@ -2546,7 +2546,7 @@ CONFIG_KERNEL_HEADER_TEST=y # CONFIG_KERNEL_ZSTD is not set CONFIG_KEXEC_FILE=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 @@ -2727,7 +2727,7 @@ CONFIG_LIVEPATCH=y CONFIG_LLC=m # CONFIG_LMK04832 is not set # CONFIG_LMP91000 is not set -CONFIG_LOAD_IPL_KEYS=y +# CONFIG_LOAD_IPL_KEYS is not set CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_LOCKDEP_BITS=16 @@ -4987,6 +4987,7 @@ CONFIG_SHUFFLE_PAGE_ALLOCATOR=y # CONFIG_SI1145 is not set # CONFIG_SI7005 is not set # CONFIG_SI7020 is not set +# CONFIG_SIGNATURE is not set # CONFIG_SIGNED_PE_FILE_VERIFICATION is not set # CONFIG_SIMPLE_PM_BUS is not set # CONFIG_SIOX is not set @@ -5684,7 +5685,7 @@ CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_XZ=y CONFIG_SQUASHFS_ZLIB=y -# CONFIG_SQUASHFS_ZSTD is not set +CONFIG_SQUASHFS_ZSTD=y # CONFIG_SRAM is not set # CONFIG_SRF04 is not set # CONFIG_SRF08 is not set @@ -5748,7 +5749,8 @@ CONFIG_SYSFS=y # CONFIG_SYS_HYPERVISOR is not set # CONFIG_SYSTEM76_ACPI is not set CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" -CONFIG_SYSTEM_BLACKLIST_KEYRING=y +# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set +# CONFIG_SYSTEM_DATA_VERIFICATION is not set # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set # CONFIG_SYSTEMPORT is not set # CONFIG_SYSTEM_REVOCATION_KEYS is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 7b0e02c7e..01f0eb08a 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -5918,7 +5918,7 @@ CONFIG_SQUASHFS=m CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_XZ=y CONFIG_SQUASHFS_ZLIB=y -# CONFIG_SQUASHFS_ZSTD is not set +CONFIG_SQUASHFS_ZSTD=y # CONFIG_SRAM is not set # CONFIG_SRF04 is not set # CONFIG_SRF08 is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 23fdaef91..f825ad948 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -5896,7 +5896,7 @@ CONFIG_SQUASHFS=m CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_XZ=y CONFIG_SQUASHFS_ZLIB=y -# CONFIG_SQUASHFS_ZSTD is not set +CONFIG_SQUASHFS_ZSTD=y # CONFIG_SRAM is not set # CONFIG_SRF04 is not set # CONFIG_SRF08 is not set diff --git a/kernel.spec b/kernel.spec index 172f173fb..560603ebc 100755 --- a/kernel.spec +++ b/kernel.spec @@ -80,7 +80,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 0 -%global distro_build 0.rc2.20210922git92477dd1faa6.20 +%global distro_build 0.rc2.20210923git58e2cf5d7946.21 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -125,13 +125,13 @@ Summary: The Linux kernel %define rpmversion 5.15.0 %define patchversion 5.15 -%define pkgrelease 0.rc2.20210922git92477dd1faa6.20 +%define pkgrelease 0.rc2.20210923git58e2cf5d7946.21 # This is needed to do merge window version magic %define patchlevel 15 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.20210922git92477dd1faa6.20%{?buildid}%{?dist} +%define specrelease 0.rc2.20210923git58e2cf5d7946.21%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -672,7 +672,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.15-rc2-32-g92477dd1faa6.tar.xz +Source0: linux-5.15-rc2-51-g58e2cf5d7946.tar.xz Source1: Makefile.rhelver @@ -1358,8 +1358,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.15-rc2-32-g92477dd1faa6 -c -mv linux-5.15-rc2-32-g92477dd1faa6 linux-%{KVERREL} +%setup -q -n kernel-5.15-rc2-51-g58e2cf5d7946 -c +mv linux-5.15-rc2-51-g58e2cf5d7946 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2958,6 +2958,9 @@ fi # # %changelog +* Thu Sep 23 2021 Fedora Kernel Team [5.15-0.rc2.20210923git58e2cf5d7946.21] +- redhat/configs: enable CONFIG_SQUASHFS_ZSTD which is already enabled in Fedora 34 (Tao Liu) [1998953] + * Sat Sep 18 2021 Fedora Kernel Team [5.15-0.rc1.20210918git4357f03d6611.16] - redhat: bump RHEL_MAJOR and add the changelog file for it (Herton R. Krzesinski) - redhat: add documentation about the os-build rebase process (Herton R. Krzesinski) diff --git a/sources b/sources index b4da23cf7..6d695bfde 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.15-rc2-32-g92477dd1faa6.tar.xz) = d3fdcce040082cc0cbd9ff8b726324455af9292558f958de78bb4c267294d500b90584d5cc1e8075f061772b1fbd1a944aa2fd17daacb8fffc5680a11353afe7 -SHA512 (kernel-abi-stablelists-5.15.0-0.rc2.20210922git92477dd1faa6.20.tar.bz2) = cd97c074b0c04a9b95695f72ef07e3e76e84c49bc4f52a41bfbf4de2564e890b49f13be41ab5071e7197942ecc6df225472f61134a2d66d960665b8ad0df5ac9 -SHA512 (kernel-kabi-dw-5.15.0-0.rc2.20210922git92477dd1faa6.20.tar.bz2) = 837aa0c7a3c843f6e8f675a109a6498e888a91721535d7b91afa6ed489feadc88afa02404b2992acba9754ca185d80485bfb9901d30473a0b8de13e5f488199e +SHA512 (linux-5.15-rc2-51-g58e2cf5d7946.tar.xz) = 55947b764a697680767a4739d5b4cd9803d92d9dd833aae1d57bdb9975fd2b8005b950920f7d5f53b8fc52252b87238e52b310c10f664c591d365148da594cfe +SHA512 (kernel-abi-stablelists-5.15.0-0.rc2.20210923git58e2cf5d7946.21.tar.bz2) = 3f6870585f387ba1040547be61b57919900a5e989bd245a1e7963e670a80f3b4ac7bf135bbc9990d7386ff8c4c66c67ce3a7119036884678c3508571d67765bf +SHA512 (kernel-kabi-dw-5.15.0-0.rc2.20210923git58e2cf5d7946.21.tar.bz2) = 108a1a819b1ea3feb6ea2a1d58acbc0da26864ed06c6f285551bac9254428943d5419a26ab2a1d286bdf275e68d5a3c975e5bbe083750da87906f8e192a65fa6 -- cgit