From 6f55855269466073772364bcf274046945891597 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 17 May 2021 08:40:56 -0500 Subject: [PATCH] kernel-5.13.0-0.rc2.19 * Mon May 17 2021 Fedora Kernel Team [5.13.0-0.rc2.19] - rpmspec: revert/drop content hash for kernel-headers (Herton R. Krzesinski) - rpmspec: fix check that calls InitBuildVars (Herton R. Krzesinski) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-fedora.config | 5 +-- kernel-aarch64-debug-rhel.config | 7 ++-- kernel-aarch64-fedora.config | 5 +-- kernel-aarch64-rhel.config | 7 ++-- kernel-armv7hl-debug-fedora.config | 2 +- kernel-armv7hl-fedora.config | 2 +- kernel-armv7hl-lpae-debug-fedora.config | 2 +- kernel-armv7hl-lpae-fedora.config | 2 +- kernel-i686-debug-fedora.config | 2 +- kernel-i686-fedora.config | 2 +- kernel-ppc64le-debug-fedora.config | 5 +-- kernel-ppc64le-debug-rhel.config | 5 +-- kernel-ppc64le-fedora.config | 5 +-- kernel-ppc64le-rhel.config | 5 +-- kernel-s390x-debug-fedora.config | 5 +-- kernel-s390x-debug-rhel.config | 7 ++-- kernel-s390x-fedora.config | 5 +-- kernel-s390x-rhel.config | 7 ++-- kernel-s390x-zfcpdump-rhel.config | 7 ++-- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-debug-rhel.config | 8 +++-- kernel-x86_64-fedora.config | 2 +- kernel-x86_64-rhel.config | 8 +++-- kernel.spec | 47 +++++++++++++------------ patch-5.13.0-redhat.patch | 16 ++++----- sources | 6 ++-- 27 files changed, 103 insertions(+), 75 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index c11ed05e1..85efc4f45 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 = 15 +RHEL_RELEASE = 19 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 3bfc03fca..34403eac3 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2981,7 +2981,7 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set +CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y @@ -3566,6 +3566,7 @@ CONFIG_LIVEPATCH=y # CONFIG_LLC2 is not set CONFIG_LLC=m CONFIG_LMP91000=m +CONFIG_LOAD_UEFI_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=15 @@ -8458,7 +8459,7 @@ CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_DFLTCC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZONE_DEVICE=y -# CONFIG_ZONEFS_FS is not set +CONFIG_ZONEFS_FS=m CONFIG_ZOPT2201=m # CONFIG_ZPA2326 is not set # CONFIG_ZRAM_DEF_COMP_842 is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index a09b3ce4d..8979a8ce5 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2346,9 +2346,11 @@ CONFIG_INPUT_UINPUT=m CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m # CONFIG_INT3406_THERMAL is not set +CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set +CONFIG_INTEGRITY_PLATFORM_KEYRING=y # CONFIG_INTEGRITY_SIGNATURE is not set +CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_IDMA64 is not set @@ -2840,6 +2842,7 @@ CONFIG_LIVEPATCH=y # CONFIG_LLC2 is not set CONFIG_LLC=m # CONFIG_LMP91000 is not set +CONFIG_LOAD_UEFI_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=15 @@ -3536,7 +3539,7 @@ CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y # CONFIG_NET_FOU_IP_TUNNELS is not set # CONFIG_NET_FOU is not set -# CONFIG_NETFS_STATS is not set +CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m # CONFIG_NET_IFE is not set CONFIG_NET_IPGRE_BROADCAST=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 0f68e14e4..914d37333 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2965,7 +2965,7 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set +CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y @@ -3544,6 +3544,7 @@ CONFIG_LIVEPATCH=y # CONFIG_LLC2 is not set CONFIG_LLC=m CONFIG_LMP91000=m +CONFIG_LOAD_UEFI_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=15 @@ -8432,7 +8433,7 @@ CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_DFLTCC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZONE_DEVICE=y -# CONFIG_ZONEFS_FS is not set +CONFIG_ZONEFS_FS=m CONFIG_ZOPT2201=m # CONFIG_ZPA2326 is not set # CONFIG_ZRAM_DEF_COMP_842 is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index c005c2f4d..1e48e78f8 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -2330,9 +2330,11 @@ CONFIG_INPUT_UINPUT=m CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m # CONFIG_INT3406_THERMAL is not set +CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set +CONFIG_INTEGRITY_PLATFORM_KEYRING=y # CONFIG_INTEGRITY_SIGNATURE is not set +CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_IDMA64 is not set @@ -2820,6 +2822,7 @@ CONFIG_LIVEPATCH=y # CONFIG_LLC2 is not set CONFIG_LLC=m # CONFIG_LMP91000 is not set +CONFIG_LOAD_UEFI_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=15 @@ -3516,7 +3519,7 @@ CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y # CONFIG_NET_FOU_IP_TUNNELS is not set # CONFIG_NET_FOU is not set -# CONFIG_NETFS_STATS is not set +CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m # CONFIG_NET_IFE is not set CONFIG_NET_IPGRE_BROADCAST=y diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 2bc27afdd..b465c8678 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -8748,7 +8748,7 @@ CONFIG_ZISOFS=y CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_DFLTCC=y CONFIG_ZLIB_INFLATE=y -# CONFIG_ZONEFS_FS is not set +CONFIG_ZONEFS_FS=m CONFIG_ZOPT2201=m # CONFIG_ZPA2326 is not set # CONFIG_ZRAM_DEF_COMP_842 is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 5153154b2..948d65438 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -8723,7 +8723,7 @@ CONFIG_ZISOFS=y CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_DFLTCC=y CONFIG_ZLIB_INFLATE=y -# CONFIG_ZONEFS_FS is not set +CONFIG_ZONEFS_FS=m CONFIG_ZOPT2201=m # CONFIG_ZPA2326 is not set # CONFIG_ZRAM_DEF_COMP_842 is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 5d66ffb40..9ea79c36e 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -8478,7 +8478,7 @@ CONFIG_ZISOFS=y CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_DFLTCC=y CONFIG_ZLIB_INFLATE=y -# CONFIG_ZONEFS_FS is not set +CONFIG_ZONEFS_FS=m CONFIG_ZOPT2201=m # CONFIG_ZPA2326 is not set # CONFIG_ZRAM_DEF_COMP_842 is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 2c6ba106a..47e15af65 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -8453,7 +8453,7 @@ CONFIG_ZISOFS=y CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_DFLTCC=y CONFIG_ZLIB_INFLATE=y -# CONFIG_ZONEFS_FS is not set +CONFIG_ZONEFS_FS=m CONFIG_ZOPT2201=m # CONFIG_ZPA2326 is not set # CONFIG_ZRAM_DEF_COMP_842 is not set diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 7a0f206e6..4ba5fa018 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -7697,7 +7697,7 @@ CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_DFLTCC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZONE_DMA=y -# CONFIG_ZONEFS_FS is not set +CONFIG_ZONEFS_FS=m CONFIG_ZOPT2201=m # CONFIG_ZPA2326 is not set # CONFIG_ZRAM_DEF_COMP_842 is not set diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index cd8d71cf5..8d030029c 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -7672,7 +7672,7 @@ CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_DFLTCC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZONE_DMA=y -# CONFIG_ZONEFS_FS is not set +CONFIG_ZONEFS_FS=m CONFIG_ZOPT2201=m # CONFIG_ZPA2326 is not set # CONFIG_ZRAM_DEF_COMP_842 is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index c97485160..c7b3f3450 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -2443,7 +2443,7 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set +CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y @@ -2990,6 +2990,7 @@ CONFIG_LIVEPATCH=y # CONFIG_LLC2 is not set CONFIG_LLC=m CONFIG_LMP91000=m +CONFIG_LOAD_PPC_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=15 @@ -7182,7 +7183,7 @@ CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_DFLTCC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZONE_DEVICE=y -# CONFIG_ZONEFS_FS is not set +CONFIG_ZONEFS_FS=m CONFIG_ZOPT2201=m # CONFIG_ZPA2326 is not set # CONFIG_ZRAM_DEF_COMP_842 is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index ffa1ba943..56a813716 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2191,7 +2191,7 @@ CONFIG_INPUT_YEALINK=m # CONFIG_INT3406_THERMAL is not set CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set +CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y @@ -2691,6 +2691,7 @@ CONFIG_LIVEPATCH=y # CONFIG_LLC2 is not set CONFIG_LLC=m # CONFIG_LMP91000 is not set +CONFIG_LOAD_PPC_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=15 @@ -3376,7 +3377,7 @@ CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y # CONFIG_NET_FOU_IP_TUNNELS is not set # CONFIG_NET_FOU is not set -# CONFIG_NETFS_STATS is not set +CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m # CONFIG_NET_IFE is not set CONFIG_NET_IPGRE_BROADCAST=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index cd87d1c9b..5984f3b51 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -2426,7 +2426,7 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set +CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y @@ -2968,6 +2968,7 @@ CONFIG_LIVEPATCH=y # CONFIG_LLC2 is not set CONFIG_LLC=m CONFIG_LMP91000=m +CONFIG_LOAD_PPC_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=15 @@ -7156,7 +7157,7 @@ CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_DFLTCC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZONE_DEVICE=y -# CONFIG_ZONEFS_FS is not set +CONFIG_ZONEFS_FS=m CONFIG_ZOPT2201=m # CONFIG_ZPA2326 is not set # CONFIG_ZRAM_DEF_COMP_842 is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 3e670271c..d020187e4 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2175,7 +2175,7 @@ CONFIG_INPUT_YEALINK=m # CONFIG_INT3406_THERMAL is not set CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set +CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y @@ -2674,6 +2674,7 @@ CONFIG_LIVEPATCH=y # CONFIG_LLC2 is not set CONFIG_LLC=m # CONFIG_LMP91000 is not set +CONFIG_LOAD_PPC_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=15 @@ -3359,7 +3360,7 @@ CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y # CONFIG_NET_FOU_IP_TUNNELS is not set # CONFIG_NET_FOU is not set -# CONFIG_NETFS_STATS is not set +CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m # CONFIG_NET_IFE is not set CONFIG_NET_IPGRE_BROADCAST=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index fb9613a77..6b97ffbc0 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -2424,7 +2424,7 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set +CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y @@ -2966,6 +2966,7 @@ CONFIG_LIVEPATCH=y # CONFIG_LLC2 is not set CONFIG_LLC=m CONFIG_LMP91000=m +CONFIG_LOAD_IPL_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=15 @@ -7126,7 +7127,7 @@ CONFIG_ZISOFS=y CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_DFLTCC=y CONFIG_ZLIB_INFLATE=y -# CONFIG_ZONEFS_FS is not set +CONFIG_ZONEFS_FS=m CONFIG_ZOPT2201=m # CONFIG_ZPA2326 is not set # CONFIG_ZRAM_DEF_COMP_842 is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 0d1d68813..131c6f477 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2170,9 +2170,11 @@ CONFIG_INPUT_UINPUT=m CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m # CONFIG_INT3406_THERMAL is not set +CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set +CONFIG_INTEGRITY_PLATFORM_KEYRING=y # CONFIG_INTEGRITY_SIGNATURE is not set +CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_IDMA64 is not set @@ -2663,6 +2665,7 @@ CONFIG_LIVEPATCH=y # CONFIG_LLC2 is not set CONFIG_LLC=m # CONFIG_LMP91000 is not set +CONFIG_LOAD_IPL_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=15 @@ -3351,7 +3354,7 @@ CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y # CONFIG_NET_FOU_IP_TUNNELS is not set # CONFIG_NET_FOU is not set -# CONFIG_NETFS_STATS is not set +CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m # CONFIG_NET_IFE is not set CONFIG_NET_IPGRE_BROADCAST=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index aa42353ff..69f8ffa15 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -2407,7 +2407,7 @@ CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set +CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y @@ -2944,6 +2944,7 @@ CONFIG_LIVEPATCH=y # CONFIG_LLC2 is not set CONFIG_LLC=m CONFIG_LMP91000=m +CONFIG_LOAD_IPL_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=15 @@ -7100,7 +7101,7 @@ CONFIG_ZISOFS=y CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_DFLTCC=y CONFIG_ZLIB_INFLATE=y -# CONFIG_ZONEFS_FS is not set +CONFIG_ZONEFS_FS=m CONFIG_ZOPT2201=m # CONFIG_ZPA2326 is not set # CONFIG_ZRAM_DEF_COMP_842 is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 5a5be3f3f..fd0ff1dcc 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2154,9 +2154,11 @@ CONFIG_INPUT_UINPUT=m CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m # CONFIG_INT3406_THERMAL is not set +CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set +CONFIG_INTEGRITY_PLATFORM_KEYRING=y # CONFIG_INTEGRITY_SIGNATURE is not set +CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_IDMA64 is not set @@ -2646,6 +2648,7 @@ CONFIG_LIVEPATCH=y # CONFIG_LLC2 is not set CONFIG_LLC=m # CONFIG_LMP91000 is not set +CONFIG_LOAD_IPL_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=15 @@ -3334,7 +3337,7 @@ CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y # CONFIG_NET_FOU_IP_TUNNELS is not set # CONFIG_NET_FOU is not set -# CONFIG_NETFS_STATS is not set +CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m # CONFIG_NET_IFE is not set CONFIG_NET_IPGRE_BROADCAST=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 8dcc37cfa..56066965c 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2173,9 +2173,11 @@ CONFIG_INPUT_UINPUT=m CONFIG_INPUT=y CONFIG_INPUT_YEALINK=m # CONFIG_INT3406_THERMAL is not set +CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set +CONFIG_INTEGRITY_PLATFORM_KEYRING=y # CONFIG_INTEGRITY_SIGNATURE is not set +CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_IDMA64 is not set @@ -2665,6 +2667,7 @@ CONFIG_LIVEPATCH=y # CONFIG_LLC2 is not set CONFIG_LLC=m # CONFIG_LMP91000 is not set +CONFIG_LOAD_IPL_KEYS=y CONFIG_LOCALVERSION="" CONFIG_LOCALVERSION_AUTO=y CONFIG_LOCKDEP_BITS=15 @@ -3355,7 +3358,7 @@ CONFIG_NETFILTER_XT_TARGET_TPROXY=m CONFIG_NETFILTER_XT_TARGET_TRACE=m # CONFIG_NET_FOU_IP_TUNNELS is not set # CONFIG_NET_FOU is not set -# CONFIG_NETFS_STATS is not set +CONFIG_NETFS_STATS=y # CONFIG_NETFS_SUPPORT is not set # CONFIG_NET_IFE is not set CONFIG_NET_IPGRE_BROADCAST=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 5a61870ed..2f562d339 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -7751,7 +7751,7 @@ CONFIG_ZLIB_DFLTCC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZONE_DEVICE=y CONFIG_ZONE_DMA=y -# CONFIG_ZONEFS_FS is not set +CONFIG_ZONEFS_FS=m CONFIG_ZOPT2201=m # CONFIG_ZPA2326 is not set # CONFIG_ZRAM_DEF_COMP_842 is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 729c7ee08..72761a4e4 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2333,8 +2333,9 @@ CONFIG_INPUT_YEALINK=m CONFIG_INT340X_THERMAL=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set +CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y +CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set CONFIG_INTEL_HID_EVENT=m @@ -2862,6 +2863,7 @@ CONFIG_LIVEPATCH=y # CONFIG_LLC2 is not set CONFIG_LLC=m # CONFIG_LMP91000 is not set +CONFIG_LOAD_UEFI_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=15 @@ -3559,7 +3561,7 @@ CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y # CONFIG_NET_FOU_IP_TUNNELS is not set # CONFIG_NET_FOU is not set -# CONFIG_NETFS_STATS is not set +CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m # CONFIG_NET_IFE is not set CONFIG_NET_IPGRE_BROADCAST=y @@ -5681,7 +5683,7 @@ CONFIG_SYSCTL=y # CONFIG_SYSFS_DEPRECATED 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_EXTRA_CERTIFICATE is not set # CONFIG_SYSTEMPORT is not set # CONFIG_SYSTEM_REVOCATION_LIST is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 3e95ad137..e45837c87 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -7726,7 +7726,7 @@ CONFIG_ZLIB_DFLTCC=y CONFIG_ZLIB_INFLATE=y CONFIG_ZONE_DEVICE=y CONFIG_ZONE_DMA=y -# CONFIG_ZONEFS_FS is not set +CONFIG_ZONEFS_FS=m CONFIG_ZOPT2201=m # CONFIG_ZPA2326 is not set # CONFIG_ZRAM_DEF_COMP_842 is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index d39900576..3e5d055a9 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2317,8 +2317,9 @@ CONFIG_INPUT_YEALINK=m CONFIG_INT340X_THERMAL=m CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y CONFIG_INTEGRITY_AUDIT=y -# CONFIG_INTEGRITY_PLATFORM_KEYRING is not set +CONFIG_INTEGRITY_PLATFORM_KEYRING=y CONFIG_INTEGRITY_SIGNATURE=y +CONFIG_INTEGRITY_TRUSTED_KEYRING=y CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set CONFIG_INTEL_HID_EVENT=m @@ -2843,6 +2844,7 @@ CONFIG_LIVEPATCH=y # CONFIG_LLC2 is not set CONFIG_LLC=m # CONFIG_LMP91000 is not set +CONFIG_LOAD_UEFI_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set CONFIG_LOCKDEP_BITS=15 @@ -3540,7 +3542,7 @@ CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER=y # CONFIG_NET_FOU_IP_TUNNELS is not set # CONFIG_NET_FOU is not set -# CONFIG_NETFS_STATS is not set +CONFIG_NETFS_STATS=y CONFIG_NETFS_SUPPORT=m # CONFIG_NET_IFE is not set CONFIG_NET_IPGRE_BROADCAST=y @@ -5659,7 +5661,7 @@ CONFIG_SYSCTL=y # CONFIG_SYSFS_DEPRECATED 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_EXTRA_CERTIFICATE is not set # CONFIG_SYSTEMPORT is not set # CONFIG_SYSTEM_REVOCATION_LIST is not set diff --git a/kernel.spec b/kernel.spec index 30e453777..4c27fabdc 100755 --- a/kernel.spec +++ b/kernel.spec @@ -66,7 +66,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc1.20210513gitc06a2ba62fc4.15 +%global distro_build 0.rc2.19 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -107,13 +107,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.13.0 -%define pkgrelease 0.rc1.20210513gitc06a2ba62fc4.15 +%define pkgrelease 0.rc2.19 # This is needed to do merge window version magic %define patchlevel 13 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20210513gitc06a2ba62fc4.15%{?buildid}%{?dist} +%define specrelease 0.rc2.19%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -203,7 +203,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 # The kernel tarball/base version %define kversion 5.13 @@ -619,7 +619,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.13-rc1-92-gc06a2ba62fc4.tar.xz +Source0: linux-5.13-rc2.tar.xz Source1: Makefile.rhelver @@ -1270,8 +1270,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.13-rc1-92-gc06a2ba62fc4 -c -mv linux-5.13-rc1-92-gc06a2ba62fc4 linux-%{KVERREL} +%setup -q -n kernel-5.13-rc2 -c +mv linux-5.13-rc2 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2043,7 +2043,7 @@ BuildKernel %make_target %kernel_image %{_use_vdso} %endif %ifnarch noarch i686 -%if !%{with_debug} && !%{with_zfcpdump} && !%{with_up} +%if !%{with_debug} && !%{with_zfcpdump} && !%{with_pae} && !%{with_up} # If only building the user space tools, then initialize the build environment # and some variables so that the various userspace tools can be built. InitBuildVars @@ -2051,7 +2051,7 @@ InitBuildVars %endif %global perf_make \ - %{__make} -s 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 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 prefix=%{_prefix} PYTHON=%{__python3} %if %{with_perf} # perf # make sure check-headers.sh is executable @@ -2060,7 +2060,7 @@ chmod +x tools/perf/check-headers.sh %endif %global tools_make \ - %{make} CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" V=1 + %{make} CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?make_opts} %if %{with_tools} %ifarch %{cpupowerarchs} @@ -2099,7 +2099,7 @@ popd %endif %global bpftool_make \ - %{__make} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_LDFLAGS="%{__global_ldflags}" DESTDIR=$RPM_BUILD_ROOT V=1 + %{__make} EXTRA_CFLAGS="${RPM_OPT_FLAGS}" EXTRA_LDFLAGS="%{__global_ldflags}" DESTDIR=$RPM_BUILD_ROOT %{?make_opts} %if %{with_bpftool} pushd tools/bpf/bpftool %{bpftool_make} @@ -2385,18 +2385,6 @@ find -type f ! -executable -exec install -D -m644 {} %{buildroot}%{_libexecdir}/ popd %endif -# We have to do the headers checksum calculation after the tools install because -# these might end up installing their own set of headers on top of kernel's -%if %{with_headers} -# compute a content hash to export as Provides: kernel-headers-checksum -HEADERS_CHKSUM=$(export LC_ALL=C; find $RPM_BUILD_ROOT/usr/include -type f -name "*.h" \ - ! -path $RPM_BUILD_ROOT/usr/include/linux/version.h | \ - sort | xargs cat | sha1sum - | cut -f 1 -d ' '); -# export the checksum via usr/include/linux/version.h, so the dynamic -# find-provides can grab the hash to update it accordingly -echo "#define KERNEL_HEADERS_CHECKSUM \"$HEADERS_CHKSUM\"" >> $RPM_BUILD_ROOT/usr/include/linux/version.h -%endif - ### ### clean ### @@ -2776,6 +2764,19 @@ fi # # %changelog +* Mon May 17 2021 Fedora Kernel Team [5.13.0-0.rc2.19] +- rpmspec: revert/drop content hash for kernel-headers (Herton R. Krzesinski) +- rpmspec: fix check that calls InitBuildVars (Herton R. Krzesinski) + +* Sat May 15 2021 Fedora Kernel Team [5.13.0-0.rc1.20210515git25a1298726e9.17] +- fedora: enable zonefs (Damien Le Moal) + +* Fri May 14 2021 Fedora Kernel Team [5.13.0-0.rc1.20210514git315d99318179.16] +- redhat: load specific ARCH keys to INTEGRITY_PLATFORM_KEYRING (Bruno Meneguele) +- redhat: enable INTEGRITY_TRUSTED_KEYRING across all variants (Bruno Meneguele) +- redhat: enable SYSTEM_BLACKLIST_KEYRING across all variants (Bruno Meneguele) +- redhat: enable INTEGRITY_ASYMMETRIC_KEYS across all variants (Bruno Meneguele) + * Thu May 13 2021 Fedora Kernel Team [5.13.0-0.rc1.20210513gitc06a2ba62fc4.15] - Remove unused boot loader specification files (David Ward) - Revert "nvme: multipath: Change default of kernel NVMe multipath to be disabled" (Mike Snitzer) diff --git a/patch-5.13.0-redhat.patch b/patch-5.13.0-redhat.patch index 292e081d8..e0e027477 100644 --- a/patch-5.13.0-redhat.patch +++ b/patch-5.13.0-redhat.patch @@ -143,7 +143,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index 53d09c414635..583c3a3510b9 100644 +index 0ed7e061c8e9..9319af840cbd 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -470,10 +470,10 @@ index c68e694fca26..146cba5ae5bc 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index a22778e880c2..ecdf66fb96b5 100644 +index 453eff8ec8c3..7a60a5d6f9ab 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c -@@ -1640,6 +1640,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) +@@ -1641,6 +1641,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) if (!acpi_match_device_ids(device, i2c_multi_instantiate_ids)) return false; @@ -1291,7 +1291,7 @@ index 7a7d5f1a80fc..de28e2633761 100644 err_netlink: diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 522c9b229f80..3161fec27575 100644 +index 762125f2905f..02aaa0a23e4b 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -241,6 +241,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -1358,7 +1358,7 @@ index 522c9b229f80..3161fec27575 100644 } EXPORT_SYMBOL_GPL(nvme_complete_rq); diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c -index 0551796517e6..79bd58079267 100644 +index f81871c7128a..6c4cc5e9be60 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -65,14 +65,10 @@ bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags) @@ -1395,7 +1395,7 @@ index 0551796517e6..79bd58079267 100644 spin_lock_irqsave(&ns->head->requeue_lock, flags); for (bio = req->bio; bio; bio = bio->bi_next) diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index 05f31a2c64bb..401a93cfffde 100644 +index 0015860ec12b..25acc9943007 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -708,6 +708,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); @@ -1406,7 +1406,7 @@ index 05f31a2c64bb..401a93cfffde 100644 void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl); int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head); void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id); -@@ -752,6 +753,9 @@ static inline bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, +@@ -753,6 +754,9 @@ static inline bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, static inline void nvme_failover_req(struct request *req) { } @@ -1781,7 +1781,7 @@ index 5db16509b6e1..5b8b5e3edd39 100644 PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, PCI_VENDOR_ID_DELL, 0x1fe0) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index b2bc4b7c4289..0da634c8abcd 100644 +index fc7d6cdacf16..33fea509ff86 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -5585,6 +5585,13 @@ static void hub_event(struct work_struct *work) diff --git a/sources b/sources index fbc363703..e57a9a09f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.13-rc1-92-gc06a2ba62fc4.tar.xz) = e464e0d10a639f0a2089d2accd41b2cc6831c8075d558c8cb37668d332fd3358cca705a8fd8bf41223beea599de7931d642dad00c30f0997ee2c30f149bfa51e -SHA512 (kernel-abi-whitelists-5.13.0-0.rc1.20210513gitc06a2ba62fc4.15.tar.bz2) = d69937ce10e0a7b6bb4817a4c6e4032f31df292811ff5505e4d3631dcd4c489591c1157dc05be4b22314c9b6870c461779fcc3e764db245c7a4606e3b104f8ed -SHA512 (kernel-kabi-dw-5.13.0-0.rc1.20210513gitc06a2ba62fc4.15.tar.bz2) = e72934a2f18c793020cb0e7df648260adec94b02190645f491a6e88fe5ed7e9f31561e1f26d6326e10037be89920d94c61433b0bcfe8f730462fbb0ba0298569 +SHA512 (linux-5.13-rc2.tar.xz) = 1a724d78029ca79a585125b3df649209f8c35a683b8f3a7b564558c53a28adb78926c23e3301ad440d7534cbb7f4c6e3be4d8833f4556bf480bd43112abb8f4a +SHA512 (kernel-abi-whitelists-5.13.0-0.rc2.19.tar.bz2) = e99e3bda44b2729452b1960669ffd05d39740231d359c71d1d269c7bc4526cbcfdb58d3a657fc5be8740ccbb01f2d038366bf052379c968f002db112a219c1e1 +SHA512 (kernel-kabi-dw-5.13.0-0.rc2.19.tar.bz2) = eca3e751286b8e185f1bf3ccece75a5c0f34acc7e8464b626ca00ef34016c6ffbfbd2727071e1d400ee77b0afe44d9ba2deedb2a704cc827c03640265f87ff8f