added guest-iso directive to test vm makefile

[palacios.git] / misc / test_vm / build / Makefile

diff --git a/misc/test_vm/build/Makefile b/misc/test_vm/build/Makefile
index df39370..bacef9f 100644 (file)
--- a/misc/test_vm/build/Makefile
+++ b/misc/test_vm/build/Makefile
@@ -122,7 +122,7 @@ COMMON_C_OBJS := $(COMMON_C_SRCS:%.c=common/%.o)
 
 # Uncomment if cross compiling
 #TARGET_CC_PREFIX := i386-elf-
-TARGET_CC_PREFIX :=  $(PROJECT_ROOT)/../devtools/i386/bin/i386-elf-
+TARGET_CC_PREFIX :=  $(PROJECT_ROOT)/../../devtools/i386/bin/i386-elf-
 
 # Target C compiler.  gcc 2.95.2 or later should work.
 TARGET_CC := $(TARGET_CC_PREFIX)gcc
@@ -150,7 +150,7 @@ TARGET_NM := $(TARGET_CC_PREFIX)nm
 TARGET_OBJCOPY := $(TARGET_CC_PREFIX)objcopy
 
 # Nasm (http://nasm.sourceforge.net)
-NASM := $(PROJECT_ROOT)/../devtools/bin/nasm
+NASM := $(PROJECT_ROOT)/../../devtools/bin/nasm
 #NASM := /opt/vmm-tools/bin/nasm
 
 AS = as --32
@@ -232,21 +232,14 @@ fd.img : geekos/fd_boot.bin geekos/setup.bin geekos/kernel.bin
        cat geekos/fd_boot.bin geekos/setup.bin geekos/kernel.bin > $@
 
 
-# make ready to boot over PXE
-pxe:   fd.img
-       cp fd.img /tftpboot/vmm.img
-       $(PAD) /tftpboot/vmm.img 1474560
 
-
-vm:    geekos/kernel.bin
-       cp geekos/kernel.bin ../../vmm-hack1/build/vm_kernel
-
-guest_img: fd.img
+guest-img: fd.img
        cp fd.img guest.img
        $(PAD) guest.img 1474560
 
-geekos/test: geekos/test.o
-       $(CC) geekos/test.o -o geekos/test
+guest-iso: guest-img
+
+       mkisofs -pad -b guest.img -R -o guest.iso guest.img