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 #8 from InPermutation/patch-1

Browse Source 
“A minimal x86 kernel” fixes
This commit is contained in:
Philipp Oppermann
2015-10-26 11:12:49 +01:00
parent 1b6d39f998 3e59075d53
commit ba938a2aeb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
_posts/2015-08-18-multiboot-kernel.md
View File

@@ -186,7 +186,7 @@ isofiles
└── kernel.bin
```
The `grub.cfg` specifies the file name of our kernel and it's Multiboot 2 compliance. It looks like this:
The `grub.cfg` specifies the file name of our kernel and its Multiboot 2 compliance. It looks like this:
```
set timeout=0
@@ -265,9 +265,9 @@ run: $(iso)
iso: $(iso)
$(iso): $(kernel)
$(iso): $(kernel) $(grub_cfg)
@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
@grub-mkrescue -o $(iso) build/isofiles 2> /dev/null
@rm -r build/isofiles