From 62fc3a8b7c8e8b6d3abd2054ddaa89f9bc240458 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 22 Jul 2022 11:01:11 -0500 Subject: [PATCH] kernel-5.19.0-0.rc7.20220722git68e77ffbfd06.56 * Fri Jul 22 2022 Fedora Kernel Team [5.19.0-0.rc7.68e77ffbfd06.55] - create-data: Parallelize spec file data (Prarit Bhargava) - create-data.sh: Store SOURCES Makefile variable (Prarit Bhargava) - redhat/Makefile: Split up setup-source target (Prarit Bhargava) - create-data.sh: Redefine varfilename (Prarit Bhargava) - create-data.sh: Parallelize variable file creation (Prarit Bhargava) - redhat/configs: Enable CONFIG_LZ4_COMPRESS (Prarit Bhargava) - redhat/docs: Update brew information (Prarit Bhargava) - redhat/Makefile: Fix eln BUILD_TARGET (Prarit Bhargava) - redhat/Makefile: Set BUILD_TARGET for dist-brew (Prarit Bhargava) - kernel.spec.template: update (s390x) expoline.o path (Joe Lawrence) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-rhel.config | 3 ++- kernel-aarch64-rhel.config | 3 ++- kernel-ppc64le-debug-rhel.config | 3 ++- kernel-ppc64le-rhel.config | 3 ++- kernel-s390x-debug-rhel.config | 3 ++- kernel-s390x-rhel.config | 3 ++- kernel-s390x-zfcpdump-rhel.config | 3 ++- kernel-x86_64-debug-rhel.config | 3 ++- kernel-x86_64-rhel.config | 3 ++- kernel.spec | 24 ++++++++++++++++++------ sources | 6 +++--- 12 files changed, 40 insertions(+), 19 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 9de7b59a5..73887609a 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 = 55 +RHEL_RELEASE = 56 # # ZSTREAM diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index c4805257c..6f14cc99b 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2982,6 +2982,7 @@ CONFIG_LTO_NONE=y CONFIG_LWTUNNEL_BPF=y CONFIG_LWTUNNEL=y CONFIG_LXT_PHY=m +CONFIG_LZ4_COMPRESS=m # CONFIG_M62332 is not set CONFIG_MAC80211_DEBUGFS=y # CONFIG_MAC80211_DEBUG_MENU is not set @@ -6056,7 +6057,7 @@ CONFIG_SYSCTL=y # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYS_HYPERVISOR is not set # CONFIG_SYSTEM76_ACPI is not set -# CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE is not set +CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE=y CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" CONFIG_SYSTEM_BLACKLIST_KEYRING=y # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index ccbb364ad..cd6b36861 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -2961,6 +2961,7 @@ CONFIG_LTO_NONE=y CONFIG_LWTUNNEL_BPF=y CONFIG_LWTUNNEL=y CONFIG_LXT_PHY=m +CONFIG_LZ4_COMPRESS=m # CONFIG_M62332 is not set # CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_DEBUG_MENU is not set @@ -6031,7 +6032,7 @@ CONFIG_SYSCTL=y # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYS_HYPERVISOR is not set # CONFIG_SYSTEM76_ACPI is not set -# CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE is not set +CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE=y CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" CONFIG_SYSTEM_BLACKLIST_KEYRING=y # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 79651f087..6011ae48b 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2811,6 +2811,7 @@ CONFIG_LTO_NONE=y CONFIG_LWTUNNEL_BPF=y CONFIG_LWTUNNEL=y CONFIG_LXT_PHY=m +CONFIG_LZ4_COMPRESS=m # CONFIG_M62332 is not set CONFIG_MAC80211_DEBUGFS=y # CONFIG_MAC80211_DEBUG_MENU is not set @@ -5819,7 +5820,7 @@ CONFIG_SYSCTL=y # CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSTEM76_ACPI is not set -# CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE is not set +CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE=y CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" CONFIG_SYSTEM_BLACKLIST_KEYRING=y CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096 diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index f0c735885..30f551d25 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2791,6 +2791,7 @@ CONFIG_LTO_NONE=y CONFIG_LWTUNNEL_BPF=y CONFIG_LWTUNNEL=y CONFIG_LXT_PHY=m +CONFIG_LZ4_COMPRESS=m # CONFIG_M62332 is not set # CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_DEBUG_MENU is not set @@ -5796,7 +5797,7 @@ CONFIG_SYSCTL=y # CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSTEM76_ACPI is not set -# CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE is not set +CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE=y CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" CONFIG_SYSTEM_BLACKLIST_KEYRING=y CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096 diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index e07c1e7c0..03cbb961a 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2789,6 +2789,7 @@ CONFIG_LTO_NONE=y CONFIG_LWTUNNEL_BPF=y CONFIG_LWTUNNEL=y # CONFIG_LXT_PHY is not set +CONFIG_LZ4_COMPRESS=m # CONFIG_M62332 is not set CONFIG_MAC80211_DEBUGFS=y # CONFIG_MAC80211_DEBUG_MENU is not set @@ -5794,7 +5795,7 @@ CONFIG_SYSCTL=y # CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSTEM76_ACPI is not set -# CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE is not set +CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE=y CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" CONFIG_SYSTEM_BLACKLIST_KEYRING=y CONFIG_SYSTEM_DATA_VERIFICATION=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index ff8c60a4b..0156188ba 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2769,6 +2769,7 @@ CONFIG_LTO_NONE=y CONFIG_LWTUNNEL_BPF=y CONFIG_LWTUNNEL=y # CONFIG_LXT_PHY is not set +CONFIG_LZ4_COMPRESS=m # CONFIG_M62332 is not set # CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_DEBUG_MENU is not set @@ -5771,7 +5772,7 @@ CONFIG_SYSCTL=y # CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSTEM76_ACPI is not set -# CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE is not set +CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE=y CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" CONFIG_SYSTEM_BLACKLIST_KEYRING=y CONFIG_SYSTEM_DATA_VERIFICATION=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index dad056049..f42583d08 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2781,6 +2781,7 @@ CONFIG_LTO_NONE=y CONFIG_LWTUNNEL_BPF=y CONFIG_LWTUNNEL=y # CONFIG_LXT_PHY is not set +CONFIG_LZ4_COMPRESS=m # CONFIG_M62332 is not set # CONFIG_MAC80211_DEBUGFS is not set # CONFIG_MAC80211_DEBUG_MENU is not set @@ -5796,7 +5797,7 @@ CONFIG_SYSCTL=y CONFIG_SYSFS=y # CONFIG_SYS_HYPERVISOR is not set # CONFIG_SYSTEM76_ACPI is not set -# CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE is not set +CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE=y CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" # CONFIG_SYSTEM_BLACKLIST_KEYRING is not set # CONFIG_SYSTEM_DATA_VERIFICATION is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index cba95a85e..5f506d9f6 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2968,6 +2968,7 @@ CONFIG_LTO_NONE=y CONFIG_LWTUNNEL_BPF=y CONFIG_LWTUNNEL=y CONFIG_LXT_PHY=m +CONFIG_LZ4_COMPRESS=m # CONFIG_M62332 is not set CONFIG_MAC80211_DEBUGFS=y # CONFIG_MAC80211_DEBUG_MENU is not set @@ -6035,7 +6036,7 @@ CONFIG_SYSCTL=y # CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSTEM76_ACPI is not set -# CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE is not set +CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE=y CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" CONFIG_SYSTEM_BLACKLIST_KEYRING=y # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 79924025b..273870906 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2948,6 +2948,7 @@ CONFIG_LTO_NONE=y CONFIG_LWTUNNEL_BPF=y CONFIG_LWTUNNEL=y CONFIG_LXT_PHY=m +CONFIG_LZ4_COMPRESS=m # CONFIG_M62332 is not set CONFIG_MAC80211_DEBUGFS=y # CONFIG_MAC80211_DEBUG_MENU is not set @@ -6011,7 +6012,7 @@ CONFIG_SYSCTL=y # CONFIG_SYSFB_SIMPLEFB is not set # CONFIG_SYSFS_DEPRECATED is not set # CONFIG_SYSTEM76_ACPI is not set -# CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE is not set +CONFIG_SYSTEM_BLACKLIST_AUTH_UPDATE=y CONFIG_SYSTEM_BLACKLIST_HASH_LIST="" CONFIG_SYSTEM_BLACKLIST_KEYRING=y # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set diff --git a/kernel.spec b/kernel.spec index 447de6649..242534366 100755 --- a/kernel.spec +++ b/kernel.spec @@ -124,13 +124,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 5.19.0 %define patchversion 5.19 -%define pkgrelease 0.rc7.20220721git353f7988dd84.55 +%define pkgrelease 0.rc7.20220722git68e77ffbfd06.56 %define kversion 5 -%define tarfile_release 5.19-rc7-7-g353f7988dd84 +%define tarfile_release 5.19-rc7-135-g68e77ffbfd06 # This is needed to do merge window version magic %define patchlevel 19 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20220721git353f7988dd84.55%{?buildid}%{?dist} +%define specrelease 0.rc7.20220722git68e77ffbfd06.56%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 5.19.0 @@ -1892,10 +1892,10 @@ BuildKernel() { rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts/spdxcheck.py %ifarch s390x - # CONFIG_EXPOLINE_EXTERN=y produces arch/s390/lib/expoline.o + # CONFIG_EXPOLINE_EXTERN=y produces arch/s390/lib/expoline/expoline.o # which is needed during external module build. - if [ -f arch/s390/lib/expoline.o ]; then - cp -a --parents arch/s390/lib/expoline.o $RPM_BUILD_ROOT/lib/modules/$KernelVer/build + if [ -f arch/s390/lib/expoline/expoline.o ]; then + cp -a --parents arch/s390/lib/expoline/expoline.o $RPM_BUILD_ROOT/lib/modules/$KernelVer/build fi %endif @@ -3139,6 +3139,18 @@ fi # # %changelog +* Fri Jul 22 2022 Fedora Kernel Team [5.19.0-0.rc7.68e77ffbfd06.55] +- create-data: Parallelize spec file data (Prarit Bhargava) +- create-data.sh: Store SOURCES Makefile variable (Prarit Bhargava) +- redhat/Makefile: Split up setup-source target (Prarit Bhargava) +- create-data.sh: Redefine varfilename (Prarit Bhargava) +- create-data.sh: Parallelize variable file creation (Prarit Bhargava) +- redhat/configs: Enable CONFIG_LZ4_COMPRESS (Prarit Bhargava) +- redhat/docs: Update brew information (Prarit Bhargava) +- redhat/Makefile: Fix eln BUILD_TARGET (Prarit Bhargava) +- redhat/Makefile: Set BUILD_TARGET for dist-brew (Prarit Bhargava) +- kernel.spec.template: update (s390x) expoline.o path (Joe Lawrence) + * Tue Jul 19 2022 Fedora Kernel Team [5.19.0-0.rc7.ca85855bdcae.53] - arm64: config: Enable DRM_V3D (Nicolas Saenz Julienne) - ARM: configs: Enable DRM_V3D (Peter Robinson) diff --git a/sources b/sources index 7fcfcb063..df7ebdd3b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.19-rc7-7-g353f7988dd84.tar.xz) = c32d978c6f26d471cfc33184856eeeefa472be2a47af4d333b74354eff700b5e65294fcd39d5faaa7d0fdea245e5709a94c7e971182df9cd81260b6ecb72cccf -SHA512 (kernel-abi-stablelists-5.19.0.tar.bz2) = cf864db74fd42f1d36fd6a614a839347cf5bbfd05b31df55d4d3fb2bce37e624567319cf77a0a1f392b587b6db0726bc486a6e18afabdc8fe1ddd2299627aa87 -SHA512 (kernel-kabi-dw-5.19.0.tar.bz2) = a5f0948a012cd02293037edcff028b69a2d443c660f5660dac2505a4c41ccf50c12ff1dcf1e3ab18f7d7a1386aecee767b40b4c62875e71a59b7dddee3e8d2a9 +SHA512 (linux-5.19-rc7-135-g68e77ffbfd06.tar.xz) = 46c8744a308320b186968eb3cdd2de5d1d1c0c351e9ad8296cd44d53aed639c1621bb8ee8b8d9101fab0744c7e84036db5f5bcea212bfce231f155c6a970b87f +SHA512 (kernel-abi-stablelists-5.19.0.tar.bz2) = 86f6b44fb0da11e9b9975eb84c2a2b9cac14b4e9f7c23cbfdb73d76be838335e0a86edcb02cc99a3a877816d7ff6261c91b00dd4a4820855bc77272b7d20f569 +SHA512 (kernel-kabi-dw-5.19.0.tar.bz2) = 6a4892751789fc646cc2812f014c7f312abace64e4549df21bc86c65f09f27a64cebec47cf689b9277f580df9544c5e98d54d099500555b92a7945eb635dea02