diff --git a/SOURCES/kernel-aarch64-centos-sig-hyperscale.config b/SOURCES/kernel-aarch64-centos-sig-hyperscale.config index 0caf2cc..8edcaf8 100644 --- a/SOURCES/kernel-aarch64-centos-sig-hyperscale.config +++ b/SOURCES/kernel-aarch64-centos-sig-hyperscale.config @@ -2185,7 +2185,7 @@ CONFIG_FIXED_PHY=y CONFIG_FM10K=m # CONFIG_FONTS is not set CONFIG_FORCEDETH=m -CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_FORCE_MAX_ZONEORDER=13 CONFIG_FORTIFY_SOURCE=y CONFIG_FPGA_BRIDGE=m CONFIG_FPGA_DFL_AFU=m @@ -5715,6 +5715,7 @@ CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m CONFIG_RH_FEDORA=y +# CONFIG_RHEL_DIFFERENCES is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set diff --git a/SOURCES/kernel-aarch64-debug-centos-sig-hyperscale.config b/SOURCES/kernel-aarch64-debug-centos-sig-hyperscale.config index 034368b..b5a87b4 100644 --- a/SOURCES/kernel-aarch64-debug-centos-sig-hyperscale.config +++ b/SOURCES/kernel-aarch64-debug-centos-sig-hyperscale.config @@ -2201,7 +2201,7 @@ CONFIG_FIXED_PHY=y CONFIG_FM10K=m # CONFIG_FONTS is not set CONFIG_FORCEDETH=m -CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_FORCE_MAX_ZONEORDER=13 CONFIG_FORTIFY_SOURCE=y CONFIG_FPGA_BRIDGE=m CONFIG_FPGA_DFL_AFU=m @@ -5738,6 +5738,7 @@ CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m CONFIG_RH_FEDORA=y +# CONFIG_RHEL_DIFFERENCES is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set diff --git a/SOURCES/kernel-x86_64-centos-sig-hyperscale.config b/SOURCES/kernel-x86_64-centos-sig-hyperscale.config index a5b257a..05a5957 100644 --- a/SOURCES/kernel-x86_64-centos-sig-hyperscale.config +++ b/SOURCES/kernel-x86_64-centos-sig-hyperscale.config @@ -5166,6 +5166,7 @@ CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m CONFIG_RH_FEDORA=y +# CONFIG_RHEL_DIFFERENCES is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set diff --git a/SOURCES/kernel-x86_64-debug-centos-sig-hyperscale.config b/SOURCES/kernel-x86_64-debug-centos-sig-hyperscale.config index d8f95a0..8205de7 100644 --- a/SOURCES/kernel-x86_64-debug-centos-sig-hyperscale.config +++ b/SOURCES/kernel-x86_64-debug-centos-sig-hyperscale.config @@ -5188,6 +5188,7 @@ CONFIG_RFKILL_GPIO=m CONFIG_RFKILL_INPUT=y CONFIG_RFKILL=m CONFIG_RH_FEDORA=y +# CONFIG_RHEL_DIFFERENCES is not set CONFIG_RING_BUFFER_BENCHMARK=m # CONFIG_RING_BUFFER_STARTUP_TEST is not set # CONFIG_RING_BUFFER_VALIDATE_TIME_DELTAS is not set diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 62d5a4c..1daadf4 100755 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -85,8 +85,12 @@ Summary: The Linux kernel %if 0%{?fedora} %define secure_boot_arch x86_64 %else +%if 0%{?centos_hs} +%define secure_boot_arch '' +%else %define secure_boot_arch x86_64 aarch64 s390x ppc64le %endif +%endif # Signing for secure boot authentication %ifarch %{secure_boot_arch} @@ -96,7 +100,11 @@ Summary: The Linux kernel %endif # Sign modules on all arches +%if 0%{?centos_hs} +%global signmodules 0 +%else %global signmodules 1 +%endif # Compress modules only for architectures that build modules %ifarch noarch @@ -2957,6 +2965,9 @@ fi # # %changelog +* Wed Oct 13 2021 Justin Vreeland - 5.14.0-%{specrelease} +- Readd pieces dropped during copy out of upstream format + * Tue Oct 12 2021 Justin Vreeland - 5.14.0-%{specrelease} - Update for CentOS Hyperscale SIG