From eb0718cddb7a39020d8b8003ef6ed1513e799261 Mon Sep 17 00:00:00 2001
From: Vasilito <adminpupkin@gmail.com>
Date: Mon, 4 May 2026 20:07:59 +0100
Subject: [PATCH] =?UTF-8?q?fix:=20kernel=20rebrand=20patch=20=E2=80=94=20c?=
 =?UTF-8?q?orrect=20post-consolidated=20context=20for=20fuzz=3D0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Generated from clean 866dfad0 + consolidated.patch state via diff.
Two hunks for x86_64: comment on line 87 and info! on line 110.
aarch64 (line 94) and riscv64 (line 100) — one hunk each.
Verified: patch applies with --fuzz=0 on top of redbear-consolidated.
Wired into kernel recipe after P8-msi.patch.
---
 .../kernel/P2-rebrand-start-message.patch     | 23 +++++++++++++------
 recipes/core/kernel/recipe.toml               |  2 +-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/local/patches/kernel/P2-rebrand-start-message.patch b/local/patches/kernel/P2-rebrand-start-message.patch
index 4b873600..d1db6948 100644
--- a/local/patches/kernel/P2-rebrand-start-message.patch
+++ b/local/patches/kernel/P2-rebrand-start-message.patch
@@ -2,7 +2,7 @@ diff --git a/src/arch/aarch64/start.rs b/src/arch/aarch64/start.rs
 index e1c8cfb4..65e3fe33 100644
 --- a/src/arch/aarch64/start.rs
 +++ b/src/arch/aarch64/start.rs
-@@ -91,7 +91,7 @@ unsafe extern "C" fn start(args_ptr: *const KernelArgs) -> ! {
+@@ -91,7 +91,7 @@
                  dtb::serial::init_early(dtb);
              }
  
@@ -15,7 +15,7 @@ diff --git a/src/arch/riscv64/start.rs b/src/arch/riscv64/start.rs
 index 2551968f..a825536a 100644
 --- a/src/arch/riscv64/start.rs
 +++ b/src/arch/riscv64/start.rs
-@@ -97,7 +97,7 @@ unsafe extern "C" fn start(args_ptr: *const KernelArgs) -> ! {
+@@ -97,7 +97,7 @@
                  init_early(dtb);
              }
  
@@ -25,15 +25,24 @@ index 2551968f..a825536a 100644
  
              if let Some(dtb) = &dtb {
 diff --git a/src/arch/x86_shared/start.rs b/src/arch/x86_shared/start.rs
-index 7a7c0ae8..62f9523c 100644
+index f1dbb6b4..2e9f7311 100644
 --- a/src/arch/x86_shared/start.rs
 +++ b/src/arch/x86_shared/start.rs
-@@ -91,7 +91,7 @@ unsafe extern "C" fn start(args_ptr: *const KernelArgs, stack_end: usize) -> ! {
-             // Set up graphical debug
-             graphical_debug::init(args.env());
+@@ -84,7 +84,7 @@
+     unsafe {
+         // EARLY CANARY: write 'R' to COM1 before any kernel init.
+         // This proves the serial hardware works and the kernel reached Rust entry.
+-        // If this character appears but "Redox OS starting..." does not,
++        // If this character appears but "RedBear OS starting..." does not,
+         // the hang is in args_ptr.read(), serial::init(), or graphical_debug::init().
+         #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
+         {
+@@ -107,7 +107,7 @@
+                 core::arch::asm!("out dx, al", in("dx") 0x3F8u16, in("al") b'S', options(nostack, preserves_flags));
+             }
  
 -            info!("Redox OS starting...");
 +            info!("RedBear OS starting...");
              args.print();
  
-             // Set up GDT
+             #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
diff --git a/recipes/core/kernel/recipe.toml b/recipes/core/kernel/recipe.toml
index b67294af..ddd294b1 100644
--- a/recipes/core/kernel/recipe.toml
+++ b/recipes/core/kernel/recipe.toml
@@ -20,7 +20,7 @@
 [source]
 git = "https://gitlab.redox-os.org/redox-os/kernel.git"
 rev = "866dfad0"
-patches = ["../../../local/patches/kernel/redbear-consolidated.patch", "../../../local/patches/kernel/P8-msi.patch"]
+patches = ["../../../local/patches/kernel/redbear-consolidated.patch", "../../../local/patches/kernel/P8-msi.patch", "../../../local/patches/kernel/P2-rebrand-start-message.patch"]
 
 [build]
 template = "custom"