From 5fd53fec1ee8710d1b7e922b6cf2120c17a90377 Mon Sep 17 00:00:00 2001 From: shockrah Date: Sat, 9 Nov 2019 14:18:38 -0800 Subject: [PATCH] changed iso target to jos.iso in prep for ci/d --- makefile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/makefile b/makefile index b937637..06d2919 100644 --- a/makefile +++ b/makefile @@ -16,7 +16,7 @@ kernel.elf: $(OBJECTS) $(LINK) -T link.ld -melf_i386 $(OBJECTS) -o kernel.elf # Builds image of our os -os.iso: kernel.elf +jos.iso: kernel.elf cp kernel.elf iso/boot/kernel.elf $(ISO) -R \ -b boot/grub/stage2_eltorito \ @@ -24,9 +24,8 @@ os.iso: kernel.elf -boot-load-size 4 \ -A os \ -input-charset utf8 \ - -quiet \ -boot-info-table \ - -o os.iso \ + -o jos.iso \ iso # Builind asm objects @@ -38,8 +37,8 @@ os.iso: kernel.elf $(CC) $(CFLAGS) $< -o $@ # Running (no recipes called) -run: os.iso +run: jos.iso bochs -f bochsrc.conf -q clean: - rm -rf *.o kernel.elf os.iso bochslog.txt + rm -rf *.o kernel.elf jos.iso bochslog.txt