From 39d0c5ad74f69ef368d6f83e4eac575e76060eb4 Mon Sep 17 00:00:00 2001 From: Michal Idziorek Date: Wed, 13 May 2015 04:52:17 +0200 Subject: passing grub modules to kernel --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8c50fba..33fa87f 100644 --- a/Makefile +++ b/Makefile @@ -85,7 +85,7 @@ ASM_MULTIBOOT_OBJ=$(patsubst %.s, %.o, $(ASM_MULTIBOOT)) ############ Final Targets ############ -all: $(FOOLOS) #$(FOOLOS_VDI) +all: $(FOOLOS) $(FOOLOS_VDI) new: clean all run: run-qemu-debug newrun: clean run @@ -151,7 +151,8 @@ $(FOOLOS): $(KERNEL_IMG) # $(SUBDIRS) # vdi image for VirtualBox $(FOOLOS_VDI): $(FOOLOS) -rm FoolOS.vdi - VBoxManage convertfromraw $< $@ --uuid 2f11ca11-c35d-4240-b77e-79e37d32616c + #VBoxManage convertfromraw $< $@ --uuid 2f11ca11-c35d-4240-b77e-79e37d32616c + VBoxManage convertfromraw ~/temp/FoolOs/disk.img $@ --uuid 2f11ca11-c35d-4240-b77e-79e37d32616c # run in our local bochs (we need cirrus support for our vesa mode) run-bochs: all -- cgit v1.2.3