diff --git a/SOURCES/1000-Debrand-specific-Red-Hat-messages.patch b/SOURCES/1000-Debrand-specific-Red-Hat-messages.patch new file mode 100644 index 0000000000000000000000000000000000000000..c1e5d13ac16f96052b1406992651b3f502a8e462 --- /dev/null +++ b/SOURCES/1000-Debrand-specific-Red-Hat-messages.patch @@ -0,0 +1,53 @@ +From 3bd763f1f60094f9e6bb8908693f26a22cad1aeb Mon Sep 17 00:00:00 2001 +From: Louis Abel <label@rockylinux.org> +Date: Wed, 20 Sep 2023 12:39:03 -0700 +Subject: [PATCH] Debrand specific Red Hat messages + +--- + arch/x86/boot/main.c | 2 +- + arch/x86/kernel/setup.c | 2 +- + init/main.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/arch/x86/boot/main.c b/arch/x86/boot/main.c +index 3c7f76dca..e56d37a80 100644 +--- a/arch/x86/boot/main.c ++++ b/arch/x86/boot/main.c +@@ -152,7 +152,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 Rocky Linux.\n"); + die(); + } + +diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c +index c07617bdc..39b6454f3 100644 +--- a/arch/x86/kernel/setup.c ++++ b/arch/x86/kernel/setup.c +@@ -811,7 +811,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 Rocky Linux 8, single threaded, single CPU 64-bit physical systems are unsupported."); + } + + /* +diff --git a/init/main.c b/init/main.c +index 2db130110..1c69d9c1f 100644 +--- a/init/main.c ++++ b/init/main.c +@@ -575,7 +575,7 @@ asmlinkage __visible void __init start_kernel(void) + page_alloc_init(); + + pr_notice("Kernel command line: %s\n", boot_command_line); +- pr_notice("Specific versions of hardware are certified with Red Hat Enterprise Linux 8. Please see the list of hardware certified with Red Hat Enterprise Linux 8 at https://catalog.redhat.com.\n"); ++ pr_notice("Specific versions of hardware are certified with Enterprise Linux 8. Please see the list of hardware certified with Enterprise Linux 8 at the Red Hat catalog: https://catalog.redhat.com.\n"); + /* parameters may set static keys */ + jump_label_init(); + parse_early_param(); +-- +2.41.0 + diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 333de4710f6d5b91bfd8851fd5e7b31c221dc16f..bbfcfdc6ed5095d864bd22641118e8f0efa85bce 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -518,8 +518,7 @@ Source4001: rpminspect.yaml # empty final patch to facilitate testing of kernel patches Patch999999: linux-kernel-test.patch -Patch1000: debrand-single-cpu.patch -Patch1001: debrand-rh-i686-cpu.patch +Patch1000: 1000-Debrand-specific-Red-Hat-messages.patch # END OF PATCH DEFINITIONS @@ -1075,6 +1074,8 @@ cd linux-%{KVERREL} ApplyOptionalPatch debrand-single-cpu.patch ApplyOptionalPatch debrand-rh-i686-cpu.patch ApplyOptionalPatch linux-kernel-test.patch +ApplyOptionalPatch 1000-Debrand-specific-Red-Hat-messages.patch + # END OF PATCH APPLICATIONS @@ -2677,7 +2678,7 @@ fi # # %changelog -* Tue Sep 19 2023 Release Engineering <releng@rockylinux.org> - 4.18.0-477.27.1 +* Wed Sep 20 2023 Release Engineering <releng@rockylinux.org> - 4.18.0-477.27.1 - Adding prod certs and changed cert date to 20210620 (Sherif Nagy) - Adding Rocky secure boot certs (Sherif Nagy) - Fixing vmlinuz removal (Sherif Nagy)