michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 22:37:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12 from phil-opp/a_minimal_kernel_fixes

Browse Source 
Makefile fixes
This commit is contained in:
Philipp Oppermann
2015-10-26 23:02:34 +01:00
parent 1e90a1e78d 5e5374cd7d
commit 8640091bc6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -37,9 +37,9 @@ run: $(iso)
iso: $(iso) iso: $(iso)
$(iso): $(kernel) $(iso): $(kernel) $(grub_cfg)
@mkdir -p build/isofiles/boot/grub @mkdir -p build/isofiles/boot/grub
@cp $(kernel) build/isofiles/boot/ @cp $(kernel) build/isofiles/boot/kernel.bin
@cp $(grub_cfg) build/isofiles/boot/grub @cp $(grub_cfg) build/isofiles/boot/grub
@grub-mkrescue -o $(iso) build/isofiles 2> /dev/null @grub-mkrescue -o $(iso) build/isofiles 2> /dev/null
@rm -r build/isofiles @rm -r build/isofiles

2
src/arch/x86_64/grub.cfg
View File

@@ -16,6 +16,6 @@ set timeout=0
set default=0 set default=0
menuentry "my os" { menuentry "my os" {
multiboot2 /boot/kernel-x86_64.bin multiboot2 /boot/kernel.bin
boot boot
} }