summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index c130e17..64ae1f9 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@ FILLUP=./data/fill.bin
############ final image (default target) ############
-all: FoolOS.img FoolData.img
+all: FoolOS.vdi
new: clean all
@@ -113,6 +113,9 @@ FoolData.img: binfont.bin $(MP_BIN) userspace/ext2.img
dd if=binfont.bin of=$@ bs=512 seek=1 conv=notrunc
dd if=userspace/ext2.img of=$@ bs=512 seek=4 conv=notrunc #will end up at 0x80800 in ram
+FoolOS.vdi: FoolOS.img
+ VBoxManage convertfromraw FoolOS.img FoolOS.vdi
+
############ vm stuff ############
# run in our local bochs (we need cirrus support for our vesa mode)
@@ -128,7 +131,7 @@ clean_release:
make -C userspace clean
clean: clean_release
- -rm FoolOS.img
+ -rm FoolOS.img FoolOS.vdi
release: new
-mv FoolOS.img release/