Fix file paths

.gitignore

@@ -1,9 +1,7 @@
 *.o
+*.a
+*.multiboot
 *.bin
+*.iso
 
 /config.mk
-
-/arch/x86/kernel
-/libk/libk.a
-/iso/image.iso
-/iso/rootfs/boot/kernelmq

Makefile

@@ -1,7 +1,7 @@
 include config.mk
 
 export INCLUDE = $(shell pwd)/include
-export KERNEL  = $(shell pwd)/arch/$(ARCH)/kernel
+export KERNEL  = $(shell pwd)/arch/$(ARCH)/kernel.multiboot
 export LIBK    = $(shell pwd)/libk/libk.a
 export MODULES = $(addprefix $(shell pwd)/modules/, dummy1.bin dummy2.bin)
 

arch/x86/Makefile

@@ -33,12 +33,12 @@ OBJS += exception.c.o
 OBJS += hwint.c.o
 OBJS += syscall.c.o
 
-all: kernel
+all: kernel.multiboot
 
 clean:
-	rm -f kernel $(OBJS)
+	rm -f kernel.multiboot $(OBJS)
 
-kernel: $(OBJS)
+kernel.multiboot: $(OBJS)
 	$(CC) -T linker.ld -o $@ -ffreestanding -nostdlib -lgcc $(OBJS) $(LIBK)
 	grub-file --is-x86-multiboot2 $@
 

iso/Makefile

@@ -3,9 +3,9 @@ run: all
 
 all:
 	grub-file --is-x86-multiboot2 "$(KERNEL)"
-	cp "$(KERNEL)" rootfs/boot/kernelmq
+	cp "$(KERNEL)" rootfs/boot/kernelmq.multiboot
 	cp $(MODULES)  rootfs/boot/
 	grub-mkrescue rootfs -o image.iso
 
 clean:
-	rm -f image.iso rootfs/boot/kernelmq rootfs/boot/*.bin
+	rm -f image.iso rootfs/boot/kernelmq.multiboot rootfs/boot/*.bin

iso/rootfs/boot/grub/grub.cfg

@@ -1,5 +1,5 @@
 menuentry "KernelMQ" {
-    multiboot2 /boot/kernelmq hello kernel
+    multiboot2 /boot/kernelmq.multiboot hello kernel
 
     module2 /boot/dummy1.bin foo bar
     module2 /boot/dummy2.bin car cdr