From 7704c4a937d260d4d971232d2aef4b9893fb4601 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 25 May 2021 15:16:49 -0500 Subject: kernel-5.13.0-0.rc3.20210525gita050a6d2b7e8.26 * Tue May 25 2021 Fedora Kernel Team [5.13.0-0.rc3.20210525gita050a6d2b7e8.26] - Make CRYPTO_EC also builtin (Simo Sorce) [1947240] - Do not hard-code a default value for DIST (David Ward) Resolves: rhbz#1947240 Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-debug-rhel.config | 2 +- kernel-aarch64-fedora.config | 2 +- kernel-aarch64-rhel.config | 2 +- 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 | 2 +- kernel-ppc64le-debug-rhel.config | 4 ++-- kernel-ppc64le-fedora.config | 2 +- kernel-ppc64le-rhel.config | 4 ++-- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-debug-rhel.config | 2 +- kernel-s390x-fedora.config | 2 +- kernel-s390x-rhel.config | 2 +- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-debug-rhel.config | 4 ++-- kernel-x86_64-fedora.config | 2 +- kernel-x86_64-rhel.config | 4 ++-- kernel.spec | 18 +++++++++++------- sources | 6 +++--- 25 files changed, 41 insertions(+), 37 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index a8e2c9884..b731697b0 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 = 25 +RHEL_RELEASE = 26 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index d2bf59612..87f515555 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1362,7 +1362,7 @@ CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_ECDH=y # CONFIG_CRYPTO_ECDSA is not set CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_ECRDSA=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 60cae73e0..1431aa5f7 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -991,7 +991,7 @@ CONFIG_CRYPTO_DRBG_HMAC=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y # CONFIG_CRYPTO_ECDH is not set -CONFIG_CRYPTO_ECDSA=m +CONFIG_CRYPTO_ECDSA=y CONFIG_CRYPTO_ECHAINIV=m # CONFIG_CRYPTO_ECRDSA is not set CONFIG_CRYPTO_ESSIV=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index bba1b07dd..4ae76f2dc 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1362,7 +1362,7 @@ CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_ECDH=y # CONFIG_CRYPTO_ECDSA is not set CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_ECRDSA=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index fb1503359..e22ebec79 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -991,7 +991,7 @@ CONFIG_CRYPTO_DRBG_HMAC=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y # CONFIG_CRYPTO_ECDH is not set -CONFIG_CRYPTO_ECDSA=m +CONFIG_CRYPTO_ECDSA=y CONFIG_CRYPTO_ECHAINIV=m # CONFIG_CRYPTO_ECRDSA is not set CONFIG_CRYPTO_ESSIV=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 884686abd..a31615584 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -1364,7 +1364,7 @@ CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_ECDH=y # CONFIG_CRYPTO_ECDSA is not set CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_ECRDSA=m diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 228ea31fe..b0b08f38c 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -1364,7 +1364,7 @@ CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_ECDH=y # CONFIG_CRYPTO_ECDSA is not set CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_ECRDSA=m diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index de04fc4af..1f743cff4 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -1334,7 +1334,7 @@ CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_ECDH=y # CONFIG_CRYPTO_ECDSA is not set CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_ECRDSA=m diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index ad516fbb7..027e49a1d 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -1334,7 +1334,7 @@ CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_ECDH=y # CONFIG_CRYPTO_ECDSA is not set CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_ECRDSA=m diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 692c88ea0..315bca2a4 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -1077,7 +1077,7 @@ CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_ECDH=y # CONFIG_CRYPTO_ECDSA is not set CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_ECRDSA=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index fa3eda9eb..a9424e617 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -1076,7 +1076,7 @@ CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_ECDH=y # CONFIG_CRYPTO_ECDSA is not set CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_ECRDSA=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 05bfd1cb4..99d30a2f8 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1016,7 +1016,7 @@ CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_ECDH=y # CONFIG_CRYPTO_ECDSA is not set CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_ECRDSA=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 969a74d88..a78c38f4c 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -848,8 +848,8 @@ CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_HMAC=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_ECDH=m -CONFIG_CRYPTO_ECDSA=m +CONFIG_CRYPTO_ECDH=y +CONFIG_CRYPTO_ECDSA=y CONFIG_CRYPTO_ECHAINIV=m # CONFIG_CRYPTO_ECRDSA is not set CONFIG_CRYPTO_ESSIV=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index b8f69086d..d06910c1f 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1015,7 +1015,7 @@ CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_ECDH=y # CONFIG_CRYPTO_ECDSA is not set CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_ECRDSA=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index f5e8c79c1..d12dc04bb 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -848,8 +848,8 @@ CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_HMAC=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_ECDH=m -CONFIG_CRYPTO_ECDSA=m +CONFIG_CRYPTO_ECDH=y +CONFIG_CRYPTO_ECDSA=y CONFIG_CRYPTO_ECHAINIV=m # CONFIG_CRYPTO_ECRDSA is not set CONFIG_CRYPTO_ESSIV=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 9890eee7f..dcf032329 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1017,7 +1017,7 @@ CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_ECDH=y # CONFIG_CRYPTO_ECDSA is not set CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_ECRDSA=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 1449cea1c..e70fb11e7 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -847,7 +847,7 @@ CONFIG_CRYPTO_DRBG_HMAC=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y # CONFIG_CRYPTO_ECDH is not set -CONFIG_CRYPTO_ECDSA=m +CONFIG_CRYPTO_ECDSA=y CONFIG_CRYPTO_ECHAINIV=m # CONFIG_CRYPTO_ECRDSA is not set CONFIG_CRYPTO_ESSIV=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 195517bba..08e4de759 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1016,7 +1016,7 @@ CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_ECDH=y # CONFIG_CRYPTO_ECDSA is not set CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_ECRDSA=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 38423903b..889c2b3c2 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -847,7 +847,7 @@ CONFIG_CRYPTO_DRBG_HMAC=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y # CONFIG_CRYPTO_ECDH is not set -CONFIG_CRYPTO_ECDSA=m +CONFIG_CRYPTO_ECDSA=y CONFIG_CRYPTO_ECHAINIV=m # CONFIG_CRYPTO_ECRDSA is not set CONFIG_CRYPTO_ESSIV=m diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 90e95b3ed..c295871c1 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -1106,7 +1106,7 @@ CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_ECDH=y # CONFIG_CRYPTO_ECDSA is not set CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_ECRDSA=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 4a6a3c6c7..c5cbb529f 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -900,8 +900,8 @@ CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_HMAC=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_ECDH=m -CONFIG_CRYPTO_ECDSA=m +CONFIG_CRYPTO_ECDH=y +CONFIG_CRYPTO_ECDSA=y CONFIG_CRYPTO_ECHAINIV=m # CONFIG_CRYPTO_ECRDSA is not set CONFIG_CRYPTO_ESSIV=m diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index aab92a6be..7b4081d21 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1105,7 +1105,7 @@ CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_ECDH=m +CONFIG_CRYPTO_ECDH=y # CONFIG_CRYPTO_ECDSA is not set CONFIG_CRYPTO_ECHAINIV=m CONFIG_CRYPTO_ECRDSA=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 11d015233..1e0c1c793 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -900,8 +900,8 @@ CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_HMAC=y CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y -CONFIG_CRYPTO_ECDH=m -CONFIG_CRYPTO_ECDSA=m +CONFIG_CRYPTO_ECDH=y +CONFIG_CRYPTO_ECDSA=y CONFIG_CRYPTO_ECHAINIV=m # CONFIG_CRYPTO_ECRDSA is not set CONFIG_CRYPTO_ESSIV=m diff --git a/kernel.spec b/kernel.spec index 45e8f7e53..154daf2d2 100755 --- a/kernel.spec +++ b/kernel.spec @@ -71,9 +71,9 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 -%global distro_build 0.rc3.25 +%global distro_build 0.rc3.20210525gita050a6d2b7e8.26 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -117,13 +117,13 @@ Summary: The Linux kernel %define kversion 5.13 %define rpmversion 5.13.0 -%define pkgrelease 0.rc3.25 +%define pkgrelease 0.rc3.20210525gita050a6d2b7e8.26 # This is needed to do merge window version magic %define patchlevel 13 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.25%{?buildid}%{?dist} +%define specrelease 0.rc3.20210525gita050a6d2b7e8.26%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -623,7 +623,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.13-rc3.tar.xz +Source0: linux-5.13-rc3-39-ga050a6d2b7e8.tar.xz Source1: Makefile.rhelver @@ -1292,8 +1292,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.13-rc3 -c -mv linux-5.13-rc3 linux-%{KVERREL} +%setup -q -n kernel-5.13-rc3-39-ga050a6d2b7e8 -c +mv linux-5.13-rc3-39-ga050a6d2b7e8 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2795,6 +2795,10 @@ fi # # %changelog +* Tue May 25 2021 Fedora Kernel Team [5.13.0-0.rc3.20210525gita050a6d2b7e8.26] +- Make CRYPTO_EC also builtin (Simo Sorce) [1947240] +- Do not hard-code a default value for DIST (David Ward) + * Mon May 24 2021 Fedora Kernel Team [5.13.0-0.rc3.25] - Override %%{debugbuildsenabled} if the --with-release option is used (David Ward) - Improve comments in SPEC file, and move some option tests and macros (David Ward) diff --git a/sources b/sources index e277118af..910235793 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.13-rc3.tar.xz) = 2c468404f85a64cb85f8e04afc7ea87e98364e85f58aefbc100826491afd6d42eddc0b5acdd771692ae12c27e9beead8cd651c7f9565aaea19be166719978b1a -SHA512 (kernel-abi-whitelists-5.13.0-0.rc3.25.tar.bz2) = b78c68c1f193fa02c3b7f1af3a5b9ef66aa7e69458cf5432eb09aa1a5202373b81dbccb014ea52443f6487b2e40bc9848c28a7228f2751795780779dfd920a5f -SHA512 (kernel-kabi-dw-5.13.0-0.rc3.25.tar.bz2) = c4ac466115ae039ef4acc20aebb6804a00f05449371bd8d75c9a97cb2dadd1e002df5870d6347a19c0674abc3ba1da9d0edd2d693ec8784fcfd5980443dd49ff +SHA512 (linux-5.13-rc3-39-ga050a6d2b7e8.tar.xz) = 24986f19834b495121a4efeed0ac4ec22ebf1d2a3c4d873c0e75a93621879d5c330381bee8af6c2ef36ab23b49edd1f29980b0aee24536766b9343ea00c51d7a +SHA512 (kernel-abi-whitelists-5.13.0-0.rc3.20210525gita050a6d2b7e8.26.tar.bz2) = 9590130a1e23b8162e3a21755b4f85a56b8ec7ceb375fd7c0e8788ee18419fb1b2af1a95908c1cb4f60d3580da482e325bb8c50f5c97112152f9fe9e0c31aa3a +SHA512 (kernel-kabi-dw-5.13.0-0.rc3.20210525gita050a6d2b7e8.26.tar.bz2) = 60b00b06371d5dcad260275d44706a728f59a63e9edb93aec8c008c413ad6426e0fcb5e66f325091c666910c68f97431e1d421b44cbed0ac19fbd8d5bf73c020 -- cgit