diff --git a/.kernel.metadata b/.kernel.metadata index 5ff4d06..29025ae 100644 --- a/.kernel.metadata +++ b/.kernel.metadata @@ -1,5 +1,3 @@ 09dbba13ccf0d7f607d3ce0bd6a295826599284e SOURCES/kernel-abi-stablelists-5.14.0-39.tar.bz2 fe98419a9f6e59f47dc9c1716b7dafa71c029393 SOURCES/kernel-kabi-dw-5.14.0-39.tar.bz2 4e8464f56136e8d504ff681ed35676da5f0e5eb6 SOURCES/linux-5.14.0-39.el9.tar.xz -95b9b811c7b0a6c98b2eafc4e7d6d24f2cb63289 SOURCES/rheldup3.x509 -d90885108d225a234a5a9d054fc80893a5bd54d0 SOURCES/rhelkpatch1.x509 diff --git a/SOURCES/debrand-rh-i686-cpu.patch b/SOURCES/debrand-rh-i686-cpu.patch deleted file mode 100644 index 8e2e5b8..0000000 --- a/SOURCES/debrand-rh-i686-cpu.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/arch/x86/boot/main.c 2019-03-13 04:04:53.000000000 -0700 -+++ b/arch/x86/boot/main.c 2019-05-25 14:31:21.043272496 -0700 -@@ -147,7 +147,7 @@ void main(void) - - /* Make sure we have all the proper CPU support */ - if (validate_cpu()) { -- puts("This processor is not supported in this version of RHEL.\n"); -+ puts("This processor is not supported in this version of AlmaLinux.\n"); - die(); - } - diff --git a/SOURCES/debrand-single-cpu.patch b/SOURCES/debrand-single-cpu.patch deleted file mode 100644 index 32b00a5..0000000 --- a/SOURCES/debrand-single-cpu.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/arch/x86/kernel/setup.c 2019-03-13 04:04:53.000000000 -0700 -+++ b/arch/x86/kernel/setup.c 2019-05-27 08:35:54.580595314 -0700 -@@ -900,7 +900,7 @@ static void rh_check_supported(void) - if (((boot_cpu_data.x86_max_cores * smp_num_siblings) == 1) && - !guest && is_kdump_kernel()) { - pr_crit("Detected single cpu native boot.\n"); -- pr_crit("Important: In Red Hat Enterprise Linux 8, single threaded, single CPU 64-bit physical systems are unsupported by Red Hat. Please contact your Red Hat support representative for a list of certified and supported systems."); -+ pr_crit("Important: In AlmaLinux 8, single threaded, single CPU 64-bit physical systems are unsupported. Please see https://www.almalinux.org for more information"); - } - - /* diff --git a/SOURCES/linux-kernel-test.patch b/SOURCES/linux-kernel-test.patch deleted file mode 100644 index e69de29..0000000 diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 4794914..beb2e8f 100755 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -826,9 +826,7 @@ Patch1: patch-%{rpmversion}-redhat.patch # empty final patch to facilitate testing of kernel patches Patch999999: linux-kernel-test.patch -Patch1000: debrand-single-cpu.patch Patch1001: debrand-rh_taint.patch -Patch1002: debrand-rh-i686-cpu.patch # END OF PATCH DEFINITIONS @@ -1367,10 +1365,7 @@ cp -a %{SOURCE1} . ApplyOptionalPatch patch-%{rpmversion}-redhat.patch %endif -ApplyOptionalPatch linux-kernel-test.patch -ApplyOptionalPatch debrand-single-cpu.patch ApplyOptionalPatch debrand-rh_taint.patch -ApplyOptionalPatch debrand-rh-i686-cpu.patch # END OF PATCH APPLICATIONS # Any further pre-build tree manipulations happen here.