vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: kernel rebrand patch — correct post-consolidated context for fuzz=0

Browse Source 
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.
This commit is contained in:
Vasilito
2026-05-04 20:07:59 +01:00
parent 1aca85e48c
commit eb0718cddb
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
local/patches/kernel/P2-rebrand-start-message.patch
+16 -7
View File
@@ -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"))]
recipes/core/kernel/recipe.toml
+1 -1
View File
@@ -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"