From 93f042da4c07999357b938543bbad7c696251506 Mon Sep 17 00:00:00 2001 From: Jacob Krall Date: Sun, 25 Oct 2015 23:51:55 -0400 Subject: [PATCH 1/3] typo --- _posts/2015-08-18-multiboot-kernel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2015-08-18-multiboot-kernel.md b/_posts/2015-08-18-multiboot-kernel.md index 80013485..f04396a5 100644 --- a/_posts/2015-08-18-multiboot-kernel.md +++ b/_posts/2015-08-18-multiboot-kernel.md @@ -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 From 0a165becfe6d7024a28b578d7a29eea012e5bf19 Mon Sep 17 00:00:00 2001 From: Jacob Krall Date: Mon, 26 Oct 2015 00:52:12 -0400 Subject: [PATCH 2/3] `make iso` depends on grub.cfg This way, if you fix a typo in grub.cfg, you don't have to `make clean` to get `make iso` to pick it up. --- _posts/2015-08-18-multiboot-kernel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2015-08-18-multiboot-kernel.md b/_posts/2015-08-18-multiboot-kernel.md index f04396a5..b396face 100644 --- a/_posts/2015-08-18-multiboot-kernel.md +++ b/_posts/2015-08-18-multiboot-kernel.md @@ -265,7 +265,7 @@ run: $(iso) iso: $(iso) -$(iso): $(kernel) +$(iso): $(kernel) $(grub_cfg) @mkdir -p build/isofiles/boot/grub @cp $(kernel) build/isofiles/boot/ @cp $(grub_cfg) build/isofiles/boot/grub From 3e59075d530ca94085395162cb2e03ef6ff3c089 Mon Sep 17 00:00:00 2001 From: Jacob Krall Date: Mon, 26 Oct 2015 00:54:30 -0400 Subject: [PATCH 3/3] Explicitly rename copied kernel to `kernel.bin` Otherwise your `grub.cfg` from earlier in the article will be out of date (we're producing `kernel-x86_64.bin`, but grub expects `kernel.bin`). --- _posts/2015-08-18-multiboot-kernel.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2015-08-18-multiboot-kernel.md b/_posts/2015-08-18-multiboot-kernel.md index b396face..310d8ddb 100644 --- a/_posts/2015-08-18-multiboot-kernel.md +++ b/_posts/2015-08-18-multiboot-kernel.md @@ -267,7 +267,7 @@ iso: $(iso) $(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