summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-09-17 10:53:09 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-09-17 10:53:09 -0500
commit4a6ac59992e3ace904ad35142e5685d7fbcebc46 (patch)
tree2457d81b515e5449634bc11a7f18abeafcdb4e05
parent6a09581235e5615d0b2519fa8c73a071c3911533 (diff)
downloadkernel-4a6ac59992e3ace904ad35142e5685d7fbcebc46.zip
kernel-4a6ac59992e3ace904ad35142e5685d7fbcebc46.tar.gz
kernel-4a6ac59992e3ace904ad35142e5685d7fbcebc46.tar.xz
kernel-5.15-0.rc1.20210917gitbdb575f87217.15
* Fri Sep 17 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc1.20210917gitbdb575f87217.15] - redhat/configs: enable SYSTEM_BLACKLIST_KEYRING which is already enabled in rhel8 and Fedora 34 (Coiby Xu) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--Makefile.rhelver2
-rw-r--r--kernel-aarch64-debug-rhel.config2
-rw-r--r--kernel-aarch64-rhel.config2
-rw-r--r--kernel-ppc64le-debug-rhel.config2
-rw-r--r--kernel-ppc64le-rhel.config2
-rw-r--r--kernel-s390x-debug-rhel.config2
-rw-r--r--kernel-s390x-rhel.config2
-rw-r--r--kernel-s390x-zfcpdump-rhel.config2
-rw-r--r--kernel-x86_64-debug-rhel.config2
-rw-r--r--kernel-x86_64-rhel.config2
-rwxr-xr-xkernel.spec15
-rw-r--r--sources6
12 files changed, 22 insertions, 19 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index e4f22ec..c11ed05 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 = 14
+RHEL_RELEASE = 15
#
# Early y+1 numbering
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index d987a2a..6a3cf7d 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -6024,7 +6024,7 @@ CONFIG_SYSCTL=y
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_SYSTEM76_ACPI is not set
CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
-# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+CONFIG_SYSTEM_BLACKLIST_KEYRING=y
# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
# CONFIG_SYSTEMPORT is not set
# CONFIG_SYSTEM_REVOCATION_KEYS is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index c4f8d23..8e754ef 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -6001,7 +6001,7 @@ CONFIG_SYSCTL=y
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_SYSTEM76_ACPI is not set
CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
-# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+CONFIG_SYSTEM_BLACKLIST_KEYRING=y
# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
# CONFIG_SYSTEMPORT is not set
# CONFIG_SYSTEM_REVOCATION_KEYS is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index d7273f7..556c375 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -5788,7 +5788,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 is not set
+CONFIG_SYSTEM_BLACKLIST_KEYRING=y
CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096
CONFIG_SYSTEM_EXTRA_CERTIFICATE=y
# CONFIG_SYSTEMPORT is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 5b3e10f..b96f63f 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -5769,7 +5769,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 is not set
+CONFIG_SYSTEM_BLACKLIST_KEYRING=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 bb59d2f..fa74b68 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -5734,7 +5734,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 is not set
+CONFIG_SYSTEM_BLACKLIST_KEYRING=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-rhel.config b/kernel-s390x-rhel.config
index 8292e93..9948039 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -5715,7 +5715,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 is not set
+CONFIG_SYSTEM_BLACKLIST_KEYRING=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 bbae935..d39d1d5 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -5748,7 +5748,7 @@ CONFIG_SYSFS=y
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_SYSTEM76_ACPI is not set
CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
-# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+CONFIG_SYSTEM_BLACKLIST_KEYRING=y
# 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 b50b3d6..7b0e02c 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -5990,7 +5990,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 is not set
+CONFIG_SYSTEM_BLACKLIST_KEYRING=y
# 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-rhel.config b/kernel-x86_64-rhel.config
index 215fbb9..23fdaef 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -5968,7 +5968,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 is not set
+CONFIG_SYSTEM_BLACKLIST_KEYRING=y
# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
# CONFIG_SYSTEMPORT is not set
# CONFIG_SYSTEM_REVOCATION_KEYS is not set
diff --git a/kernel.spec b/kernel.spec
index 5567084..0e6a580 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.rc1.20210916gitff1ffd71d5f0.14
+%global distro_build 0.rc1.20210917gitbdb575f87217.15
%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.rc1.20210916gitff1ffd71d5f0.14
+%define pkgrelease 0.rc1.20210917gitbdb575f87217.15
# This is needed to do merge window version magic
%define patchlevel 15
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc1.20210916gitff1ffd71d5f0.14%{?buildid}%{?dist}
+%define specrelease 0.rc1.20210917gitbdb575f87217.15%{?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-rc1-33-gff1ffd71d5f0.tar.xz
+Source0: linux-5.15-rc1-164-gbdb575f87217.tar.xz
Source1: Makefile.rhelver
@@ -1358,8 +1358,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.15-rc1-33-gff1ffd71d5f0 -c
-mv linux-5.15-rc1-33-gff1ffd71d5f0 linux-%{KVERREL}
+%setup -q -n kernel-5.15-rc1-164-gbdb575f87217 -c
+mv linux-5.15-rc1-164-gbdb575f87217 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2958,6 +2958,9 @@ fi
#
#
%changelog
+* Fri Sep 17 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc1.20210917gitbdb575f87217.15]
+- redhat/configs: enable SYSTEM_BLACKLIST_KEYRING which is already enabled in rhel8 and Fedora 34 (Coiby Xu)
+
* Thu Sep 16 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc1.20210916gitff1ffd71d5f0.14]
- Build kernel-doc for Fedora (Justin M. Forbes)
diff --git a/sources b/sources
index 5e13824..77c162d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.15-rc1-33-gff1ffd71d5f0.tar.xz) = d9c173ad69f556f8feb490d7f81c15f1440d7f16752760a7d428474a02dc5b0ec9b0aa03b00b20d55d31603de4dcb916507925bbefac4acfa827054c66e9bb31
-SHA512 (kernel-abi-stablelists-5.15.0-0.rc1.20210916gitff1ffd71d5f0.14.tar.bz2) = d9f414f8aa3c11c093274efdd6fcfe0d328c99796be3b0b7009dd2625d4a47fec2a6750f1928a6457ce198f93e941d180a291e469fad7a6f25d7e0e526ee71f6
-SHA512 (kernel-kabi-dw-5.15.0-0.rc1.20210916gitff1ffd71d5f0.14.tar.bz2) = 1974c7d61774ac4e530b0f63feed6540cb92e4121ecb605a76013aae120252279b5a6a0514d77e35bdcae070df07a04d89e9ff767dd94daaa666cd54250b3b64
+SHA512 (linux-5.15-rc1-164-gbdb575f87217.tar.xz) = ee2e2f026d60f2f6e4e36a2db1c15d59794de3b4641be32496d8beb935e3b4186dd1c1724f024c598259ed9248a04c25b2817e6af553e7f1b8ac520f9861718c
+SHA512 (kernel-abi-stablelists-5.15.0-0.rc1.20210917gitbdb575f87217.15.tar.bz2) = ec8ffecd8ecb720fa8a7aa025a0557c9ca4b4acd618c808c42619ebec2ca517c27c39ce60ad1bc750407948529a5629dd39a4fbc00363a2c92cea97f19f2a862
+SHA512 (kernel-kabi-dw-5.15.0-0.rc1.20210917gitbdb575f87217.15.tar.bz2) = 988029548b56cbb7fc8bc44ba7b9fb5f38d7177c6e63f4a0ac1c4ae87c7664fe1a10a7511676f2f4b29edb2b4c65807122c67a8543347ba8c4b07ae2fdab5ab6