diff options
| -rwxr-xr-x | .bk-to-hg | 8 | ||||
| -rwxr-xr-x | .hg-to-bk | 8 | ||||
| -rw-r--r-- | .rootkeys | 4 | ||||
| -rw-r--r-- | extras/mini-os/Makefile | 20 |
4 files changed, 12 insertions, 28 deletions
@@ -1,13 +1,5 @@ #!/bin/sh -x set -e -test -L extras/mini-os/h/hypervisor-ifs/block.h -rm extras/mini-os/h/hypervisor-ifs/block.h -test -L extras/mini-os/h/hypervisor-ifs/hypervisor-if.h -rm extras/mini-os/h/hypervisor-ifs/hypervisor-if.h -test -L extras/mini-os/h/hypervisor-ifs/kbd.h -rm extras/mini-os/h/hypervisor-ifs/kbd.h -test -L extras/mini-os/h/hypervisor-ifs/network.h -rm extras/mini-os/h/hypervisor-ifs/network.h test -L xenolinux-sparse rm xenolinux-sparse (find -depth -type d -print | xargs -r rmdir 2>/dev/null) || true @@ -1,13 +1,5 @@ #!/bin/sh -x set -e -mkdir -p extras -mkdir -p extras/mini-os -mkdir -p extras/mini-os/h -mkdir -p extras/mini-os/h/hypervisor-ifs -ln -s ../../../xen/include/hypervisor-ifs/block.h extras/mini-os/h/hypervisor-ifs/block.h -ln -s ../../../xen/include/hypervisor-ifs/hypervisor-if.h extras/mini-os/h/hypervisor-ifs/hypervisor-if.h -ln -s ../../../xen/include/hypervisor-ifs/kbd.h extras/mini-os/h/hypervisor-ifs/kbd.h -ln -s ../../../xen/include/hypervisor-ifs/network.h extras/mini-os/h/hypervisor-ifs/network.h ln -s xenolinux-2.4.22-sparse xenolinux-sparse (find -depth -type d -print | xargs -r rmdir 2>/dev/null) || true exit 0 @@ -11,10 +11,6 @@ 3f815144wiiDekmfMl9LIPIvhR83Uw extras/mini-os/entry.S 3f815144r7AHj8GPvc3Nl1L9OSsWIg extras/mini-os/events.c 3f815144h-Chna6E38yo40jqU95G1Q extras/mini-os/h/events.h -3f815144oqr2OlUDzE2GfkKX5Hcxqg extras/mini-os/h/hypervisor-ifs/block.h -3f8151443nGXvfUTFG67VXOIH8P4lg extras/mini-os/h/hypervisor-ifs/hypervisor-if.h -3f81514417ZlYqiRdM_AHPy7G11htA extras/mini-os/h/hypervisor-ifs/kbd.h -3f815144J3ZfU5am03Td7Wjfrz30qQ extras/mini-os/h/hypervisor-ifs/network.h 3f8151445bYdgThGHQPeOW49PsrJ_A extras/mini-os/h/hypervisor.h 3f815144f2Vg3qb6tiwt2VZad-DWsg extras/mini-os/h/lib.h 3f815144iqXtdYup_pyfPSmDZuvZcg extras/mini-os/h/list.h diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile index 251ee273ba..f437cf2f58 100644 --- a/extras/mini-os/Makefile +++ b/extras/mini-os/Makefile @@ -5,7 +5,7 @@ LD := ld MONITOR_BASE := 0xE0100000 CFLAGS := -fno-builtin -O3 -Wall -Ih/ -TARGET := image.final +TARGET := mini-os LOBJS:= lib/malloc.o lib/math.o lib/printf.o lib/string.o OBJS := entry.o kernel.o traps.o hypervisor.o mm.o events.o time.o ${LOBJS} @@ -15,22 +15,26 @@ HDRS := h/os.h h/types.h h/hypervisor.h h/mm.h h/events.h h/time.h h/lib.h $(HI default: $(TARGET) -$(TARGET): head.o $(OBJS) +hypervisor-ifs: + ln -sf ../../../xen/include/hypervisor-ifs h/hypervisor-ifs + +$(TARGET): hypervisor-ifs head.o $(OBJS) # Image will load at 0xC0000000. First bytes from head.o - #$(LD) -N -Ttext 0xC0000000 head.o $(OBJS) -o image.elf - $(LD) -N -T vmlinux.lds head.o $(OBJS) -o image.elf + #$(LD) -N -Ttext 0xC0000000 head.o $(OBJS) -o $@.elf + $(LD) -N -T vmlinux.lds head.o $(OBJS) -o $@.elf # Guest OS header -- first 8 bytes are identifier 'XenoGues'. echo -e -n 'XenoGues' >$@ # Guest OS header -- next 4 bytes are load address (0xC0000000). echo -e -n '\000\000\000\300' >>$@ # Create a raw bag of bytes from the ELF image. - objcopy -O binary -R .note -R .comment image.elf image.raw + objcopy -O binary -R .note -R .comment $@.elf $@.raw # Guest OS header is immediately followed by raw OS image. - cat image.raw >>$@ - #gzip -f -9 $@ + cat $@.raw >>$@ + gzip -f -9 -c $@ >$@.gz clean: - rm -f *.o *~ core image.elf image.raw image.final image.final.gz + find . -type f -name '*.o' | xargs rm -f + rm -f *.o *~ core $(TARGET).elf $(TARGET).raw $(TARGET) $(TARGET).gz %.o: %.c $(HDRS) Makefile $(CC) $(CFLAGS) -c $< -o $@ |