changed iso target to jos.iso in prep for ci/d
This commit is contained in:
parent
b9193b6ab9
commit
5fd53fec1e
9
makefile
9
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
|
||||
|
Loading…
Reference in New Issue
Block a user