diff --git a/.gitignore b/.gitignore index 624b320..ff6a9d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ **/.zig-cache boot/core -boot/init +boot/astryon/** tools/bin/ tools/include/ tools/share/ diff --git a/boot/easyboot/menu.cfg b/boot/easyboot/menu.cfg index 5e7a59f..9417800 100644 --- a/boot/easyboot/menu.cfg +++ b/boot/easyboot/menu.cfg @@ -4,5 +4,5 @@ default 1 1000 menuentry Astryon default kernel core - module init - module memory + module astryon/init + module astryon/memory diff --git a/boot/memory b/boot/memory deleted file mode 100755 index 4b558d2..0000000 Binary files a/boot/memory and /dev/null differ diff --git a/core/src/main.zig b/core/src/main.zig index f33b101..2f35852 100644 --- a/core/src/main.zig +++ b/core/src/main.zig @@ -88,8 +88,8 @@ export fn main(magic: u32, info: MultibootInfo) callconv(.C) noreturn { const stack = try elf.allocateStack(context.allocator, space, base - platform.PAGE_SIZE, default_stack_size); thread.arch.setStack(&module.regs, stack); - const init_name = "init"; - if (std.mem.eql(u8, init_name[0..init_name.len], mod.string()[0..init_name.len])) context.init = module; + const init_path = "astryon/init"; + if (std.mem.eql(u8, init_path[0..init_path.len], mod.string()[0..init_path.len])) context.init = module; } fn handler(mod: *easyboot.multiboot_tag_module_t, context: *anyopaque) void { diff --git a/system/init/build.zig b/system/init/build.zig index 3679ff3..108da28 100644 --- a/system/init/build.zig +++ b/system/init/build.zig @@ -33,7 +33,7 @@ pub fn buildAsSubmodule(b: *std.Build, build_step: *std.Build.Step, optimize: st const install = b.addInstallArtifact(init, .{ .dest_dir = .{ - .override = .{ .custom = "boot/" }, + .override = .{ .custom = "boot/astryon/" }, }, }); diff --git a/system/memory/build.zig b/system/memory/build.zig index 6279438..119ddfc 100644 --- a/system/memory/build.zig +++ b/system/memory/build.zig @@ -33,7 +33,7 @@ pub fn buildAsSubmodule(b: *std.Build, build_step: *std.Build.Step, optimize: st const install = b.addInstallArtifact(memory, .{ .dest_dir = .{ - .override = .{ .custom = "boot/" }, + .override = .{ .custom = "boot/astryon/" }, }, });