diff --git a/SOURCES/1000-debrand-some-messages.patch b/SOURCES/1000-debrand-some-messages.patch index be79a76f9ade21d015c16d11fd6d22f65b6432ae..683c60b5af80f69575952182386a4483bbe4a85c 100644 --- a/SOURCES/1000-debrand-some-messages.patch +++ b/SOURCES/1000-debrand-some-messages.patch @@ -1,6 +1,6 @@ -From 067031cfb0fbd7d2d30e5643c8a17f97d0339c78 Mon Sep 17 00:00:00 2001 -From: Louis Abel <label@rockylinux.org> -Date: Sun, 7 Apr 2024 22:35:59 -0700 +From e4d0735901b6bb19eff89d202c5cd78f2520b3ed Mon Sep 17 00:00:00 2001 +From: Louis Abel <label@resf.org> +Date: Fri, 15 Nov 2024 10:51:55 +0000 Subject: [PATCH] Debrand some messages --- @@ -10,10 +10,10 @@ Subject: [PATCH] Debrand some messages 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/init/main.c b/init/main.c -index def810583233..6f5c0b20f440 100644 +index bcbc795f7..dce212770 100644 --- a/init/main.c +++ b/init/main.c -@@ -946,7 +946,7 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void) +@@ -878,7 +878,7 @@ asmlinkage __visible void __init __no_sanitize_address __noreturn start_kernel(v boot_cpu_init(); page_address_init(); pr_notice("%s", linux_banner); @@ -23,7 +23,7 @@ index def810583233..6f5c0b20f440 100644 setup_arch(&command_line); setup_boot_config(); diff --git a/kernel/rh_messages.h b/kernel/rh_messages.h -index 5b7570edbe26..4e68286630f3 100644 +index b798ad5d4..d02c47d81 100644 --- a/kernel/rh_messages.h +++ b/kernel/rh_messages.h @@ -43,8 +43,8 @@ @@ -38,7 +38,7 @@ index 5b7570edbe26..4e68286630f3 100644 static const char *rh_deprecated_drivers[] = { "aacraid", diff --git a/kernel/rh_shadowman.c b/kernel/rh_shadowman.c -index 018d5c633378..d6491e4e73f6 100644 +index 018d5c633..d6491e4e7 100644 --- a/kernel/rh_shadowman.c +++ b/kernel/rh_shadowman.c @@ -5,33 +5,34 @@ @@ -104,5 +104,5 @@ index 018d5c633378..d6491e4e73f6 100644 return 1; } -- -2.44.0 +2.43.5 diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 8fedf2cba154a03524546e383ce3200c902eaf84..a76aeeefa803cb2ba88320e8ed36fd90c7da7b67 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -1715,6 +1715,7 @@ ApplyOptionalPatch patch-%{patchversion}-redhat.patch %endif ApplyOptionalPatch linux-kernel-test.patch +ApplyOptionalPatch 1000-debrand-some-messages.patch # END OF PATCH APPLICATIONS @@ -3794,7 +3795,7 @@ fi # # %changelog -* Thu Nov 14 2024 Release Engineering <releng@rockylinux.org> - 5.14.0-503.14.1 +* Fri Nov 15 2024 Release Engineering <releng@rockylinux.org> - 5.14.0-503.14.1 - Porting to Rocky Linux 9, debranding and Rocky branding - Ensure aarch64 kernel is not compressed