From d45a5e8d11bcb7cb6942dd73aa3801c4ee5181e6 Mon Sep 17 00:00:00 2001 From: Marin Ivanov Date: Fri, 3 May 2024 22:52:56 +0300 Subject: boot: move grub.cfg into src/boot/ --- build.zig | 2 +- src/boot/grub.cfg | 3 +++ src/grub.cfg | 3 --- 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 src/boot/grub.cfg delete mode 100644 src/grub.cfg diff --git a/build.zig b/build.zig index a7a9ee2..d246e47 100644 --- a/build.zig +++ b/build.zig @@ -49,7 +49,7 @@ pub fn build(b: *Build) !void { const kernel_path = try fs.path.join(b.allocator, &[_][]const u8{ b.install_path, "bin", kernel.out_filename }); const iso_path = b.fmt("{s}/disk.iso", .{b.exe_dir}); - const iso_cmd_str = &[_][]const u8{ "/bin/sh", "-c", std.mem.concat(b.allocator, u8, &[_][]const u8{ "mkdir -p ", iso_dir, "/boot/grub", " && ", "cp ", kernel_path, " ", iso_dir, "/boot", " && ", "cp src/grub.cfg ", iso_dir, "/boot/grub", " && ", "grub-mkrescue -o ", iso_path, " ", iso_dir }) catch unreachable }; + const iso_cmd_str = &[_][]const u8{ "/bin/sh", "-c", std.mem.concat(b.allocator, u8, &[_][]const u8{ "mkdir -p ", iso_dir, "/boot/grub", " && ", "cp ", kernel_path, " ", iso_dir, "/boot", " && ", "cp src/boot/grub.cfg ", iso_dir, "/boot/grub", " && ", "grub-mkrescue -o ", iso_path, " ", iso_dir }) catch unreachable }; const iso_cmd = b.addSystemCommand(iso_cmd_str); iso_cmd.step.dependOn(kernel_step); diff --git a/src/boot/grub.cfg b/src/boot/grub.cfg new file mode 100644 index 0000000..2629c03 --- /dev/null +++ b/src/boot/grub.cfg @@ -0,0 +1,3 @@ +menuentry "Zig Bare Bones" { + multiboot2 /boot/kernel.elf +} diff --git a/src/grub.cfg b/src/grub.cfg deleted file mode 100644 index 2629c03..0000000 --- a/src/grub.cfg +++ /dev/null @@ -1,3 +0,0 @@ -menuentry "Zig Bare Bones" { - multiboot2 /boot/kernel.elf -} -- cgit v1.2.3