1
0
Fork 0
mirror of https://github.com/tailix/kernel.git synced 2024-10-30 12:03:52 -04:00

Change ext from ".multiboot" to ".multiboot2"

This commit is contained in:
Braiden Vasco 2017-11-08 10:07:33 +00:00
parent 2e23f70e6f
commit 117865bd5a
4 changed files with 5 additions and 5 deletions

2
.gitignore vendored
View file

@ -1,6 +1,6 @@
*.o
*.a
*.multiboot
*.multiboot2
*.bin
*.iso

View file

@ -5,7 +5,7 @@ export AS = $(CCPREFIX)as
export CC = $(CCPREFIX)gcc
export INCLUDE = $(shell pwd)/include
export KERNEL = $(shell pwd)/kernelmq.multiboot
export KERNEL = $(shell pwd)/kernelmq.multiboot2
export LIBK = $(shell pwd)/libk/libk.a
export LIBARCH = $(shell pwd)/arch/$(ARCH)/libarch.a
export LINKER = $(shell pwd)/arch/$(ARCH)/linker.ld

View file

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

View file

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