diff --git a/.gitignore b/.gitignore index a1e9318..10d43b6 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /modules/dummy /iso/image.iso /iso/rootfs/boot/kernelmq +/iso/rootfs/boot/dummy diff --git a/Makefile b/Makefile index 70b5dc6..34bf467 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,7 @@ include config.mk export INCLUDE = $(shell pwd)/include export KERNEL = $(shell pwd)/arch/kernel export LIBK = $(shell pwd)/libk/libk.a +export DUMMY = $(shell pwd)/modules/dummy run: run-iso @@ -28,7 +29,7 @@ clean-kernel: run-iso: all-iso make run -C iso -all-iso: all-kernel +all-iso: all-kernel all-modules make all -C iso clean-iso: diff --git a/iso/Makefile b/iso/Makefile index 7f24c23..c73be41 100644 --- a/iso/Makefile +++ b/iso/Makefile @@ -4,7 +4,8 @@ run: all all: grub-file --is-x86-multiboot2 "$(KERNEL)" cp "$(KERNEL)" rootfs/boot/kernelmq + cp "$(DUMMY)" rootfs/boot/dummy grub-mkrescue rootfs -o image.iso clean: - rm -f image.iso rootfs/boot/kernelmq + rm -f image.iso rootfs/boot/kernelmq rootfs/boot/dummy diff --git a/iso/rootfs/boot/grub/grub.cfg b/iso/rootfs/boot/grub/grub.cfg index 4993a0e..ad3f35c 100644 --- a/iso/rootfs/boot/grub/grub.cfg +++ b/iso/rootfs/boot/grub/grub.cfg @@ -1,5 +1,4 @@ menuentry "KernelMQ" { multiboot2 /boot/kernelmq hello kernel - module2 /boot/grub/grub.cfg qwe rty - module2 /boot/kernelmq foo bar + module2 /boot/dummy qwe rty }