os-k-team/os-k
os-k-team/os-k
1
0
Fork 0
mirror of https://gitlab.os-k.eu/os-k-team/os-k.git synced 2023-08-25 14:03:10 +02:00
Code Releases Activity

And now with transparent installation !

Browse Source
This commit is contained in:
Adrien Bourmault 2019-11-11 18:45:52 +01:00
parent 9171b7728d
commit 20debf2df0
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -267,16 +267,16 @@ OS/K: $(dep) ./ProjectTree $(BINDIR)/kaleid
test: all install test: all install
@qemu-system-x86_64 -vga std -cpu core2duo -soundhw pcspk -s \ @qemu-system-x86_64 -vga std -cpu core2duo -soundhw pcspk -s \
-rtc base=localtime -m $(ram) -hda $(BUILDDIR)/bin/disk.img \ -rtc base=localtime -m $(ram) -hda $(installdisk) \
-d cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log & -d cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log &
test32: all install test32: all install
@qemu-system-i386 -m $(ram) -hda $(BUILDDIR)/bin/disk.img -d \ @qemu-system-i386 -m $(ram) -hda $(installdisk) -d \
cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log & cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log &
gdb: all install gdb: all install
@setsid qemu-system-x86_64 -m $(ram) -soundhw pcspk -rtc base=localtime \ @setsid qemu-system-x86_64 -m $(ram) -soundhw pcspk -rtc base=localtime \
-hda $(BUILDDIR)/bin/disk.img -no-reboot -no-shutdown -d \ -hda $(installdisk) -no-reboot -no-shutdown -d \
cpu_reset,guest_errors,pcall,int -s -S 2> $(BUILDDIR)/qemu.log & cpu_reset,guest_errors,pcall,int -s -S 2> $(BUILDDIR)/qemu.log &
@gdb \ @gdb \
-ex "set arch i386:x86-64:intel" \ -ex "set arch i386:x86-64:intel" \
@ -285,7 +285,7 @@ gdb: all install
-ex "break BtStartKern" \ -ex "break BtStartKern" \
ddd: all install_os_k ddd: all install_os_k
@setsid qemu-system-x86_64 -m $(ram) -hda $(BUILDDIR)/bin/disk.img -no-reboot -soundhw pcspk \ @setsid qemu-system-x86_64 -m $(ram) -hda $(installdisk) -no-reboot -soundhw pcspk \
-no-shutdown -d cpu_reset,guest_errors,pcall,int -s 2> $(BUILDDIR)/qemu.log & -no-shutdown -d cpu_reset,guest_errors,pcall,int -s 2> $(BUILDDIR)/qemu.log &
@ddd @ddd
@ -297,9 +297,9 @@ install: $(installdisk) $(MBRDIR)/grub.cfg $(BINDIR)/kaleid
@$(BUILDDIR)/install-os-k.sh $(installdisk) $(MBRDIR)/grub.cfg $(BINDIR)/kaleid @$(BUILDDIR)/install-os-k.sh $(installdisk) $(MBRDIR)/grub.cfg $(BINDIR)/kaleid
@echo ${CL2}[$@] ${CL}Success.${CL3} @echo ${CL2}[$@] ${CL}Success.${CL3}
$(BINDIR)/disk.img: $(BUILDDIR)/create_disk.sh $(installdisk): $(BUILDDIR)/create_disk.sh
@echo ${CL2}[$@]${NC} Constructing disk image...${CL3} @echo ${CL2}[$@]${NC} Constructing disk image...${CL3}
@$(BUILDDIR)/create_disk.sh $(BINDIR)/disk.img @$(BUILDDIR)/create_disk.sh $(installdisk)
@echo ${CL2}[$@]${NC} Constructing disk image...${CL3} @echo ${CL2}[$@]${NC} Constructing disk image...${CL3}