diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 27 |
1 files changed, 12 insertions, 15 deletions
@@ -10,7 +10,7 @@ GIT_REVISION=$(shell git rev-parse HEAD) QEMU=/home/miguel/git/EXT/qemu-3.0.0/i386-softmmu/qemu-system-i386 -QEMU=qemu-system-i386 +#QEMU=qemu-system-i386 #use our cross compiler CC=i686-foolos-gcc @@ -137,8 +137,8 @@ all: tags $(FOOLOS_ISO) #$(FOOLOS) # tags # $(FOOLOS_VDI) new: clean all newrun: clean run -run: run-qemu -debug: run-qemu-debug +run: qemu-run +debug: qemu-debug ########## INCLUDES ################### @@ -188,7 +188,7 @@ $(KERNEL_IMG): $(ASM_OBJECTS) $(OBJECTS) # ~/opt/bochs-2.6.8/bin/bochs -q -f bochs/bochsrc -rc bochs/bochsdebug # run in qemu -run-qemu: all +qemu-run: all #qemu-system-i386 -enable-kvm disk.img -smp 4 -s #qemu-system-i386 -enable-kvm -s -kernel foolos.img -smp 4 -initrd userspace/ext2.img echo XDOTOOL HACK...&& sleep 0.2 && xdotool search --name "QEMU" windowsize 100 100 && echo XDOTOOL HACK END. & @@ -199,26 +199,23 @@ run-qemu: all -m 1024 #-net dump,file=./netfool -run-qemu-16: all - #qemu-system-i386 -enable-kvm disk.img -smp 4 -s - #qemu-system-i386 -enable-kvm -s -kernel foolos.img -smp 4 -initrd userspace/ext2.img - echo XDOTOOL HACK...&& sleep 0.2 && xdotool search --name "QEMU" windowsize 100 100 && echo XDOTOOL HACK END. & - qemu-system-i386 -enable-kvm $(FOOLOS_ISO) -smp 16 -serial stdio -run-qemu-debug: all +qemu-debug: all + echo XDOTOOL HACK...&& sleep 0.2 && xdotool search --name "QEMU" windowsize 100 100 && echo XDOTOOL HACK END. & + $(QEMU) -enable-kvm $(FOOLOS_ISO) -smp 4 -serial stdio \ + -net nic,model=e1000 \ + -net tap,ifname=tap0,script=no,downscript=no \ + -vga virtio \ + -m 1024 # qemu -enable-kvm -s -S ~/temp/FoolOs/disk.img # qemu -enable-kvm -s -singlestep disk.img # qemu-system-i386 -enable-kvm -s -S -kernel foolos.img -smp 4 -initrd userspace/ext2.img - echo XDOTOOL HACK...&& sleep 0.2 && xdotool search --name "QEMU" windowsize 100 100 && echo XDOTOOL HACK END. & - $(QEMU) -s -S -enable-kvm $(FOOLOS_ISO) -smp 4 -serial stdio \ - -net nic,model=e1000 \ - -net tap,ifname=tap0,script=no,downscript=no #-net dump,file=./netfool \ monitor: echo XDOTOOL HACK...&& sleep 0.2 && xdotool search --name "QEMU" windowsize 100 100 && echo XDOTOOL HACK END. & qemu-system-i386 -s -S $(FOOLOS_ISO) -smp 4 -monitor stdio # -serial stdio #-enable-kvm -smp 1 -stop-qemu: +qemu-kill: killall qemu-system-i386 |