shockrah/jankos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed iso target to jos.iso in prep for ci/d

Browse Source
This commit is contained in:
shockrah 2019-11-09 14:18:38 -08:00
parent b9193b6ab9
commit 5fd53fec1e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
makefile
View File

@ -16,7 +16,7 @@ kernel.elf: $(OBJECTS)
$(LINK) -T link.ld -melf_i386 $(OBJECTS) -o kernel.elf $(LINK) -T link.ld -melf_i386 $(OBJECTS) -o kernel.elf
# Builds image of our os # Builds image of our os
os.iso: kernel.elf jos.iso: kernel.elf
cp kernel.elf iso/boot/kernel.elf cp kernel.elf iso/boot/kernel.elf
$(ISO) -R \ $(ISO) -R \
-b boot/grub/stage2_eltorito \ -b boot/grub/stage2_eltorito \
@ -24,9 +24,8 @@ os.iso: kernel.elf
-boot-load-size 4 \ -boot-load-size 4 \
-A os \ -A os \
-input-charset utf8 \ -input-charset utf8 \
-quiet \
-boot-info-table \ -boot-info-table \
-o os.iso \ -o jos.iso \
iso iso
# Builind asm objects # Builind asm objects
@ -38,8 +37,8 @@ os.iso: kernel.elf
$(CC) $(CFLAGS) $< -o $@ $(CC) $(CFLAGS) $< -o $@
# Running (no recipes called) # Running (no recipes called)
run: os.iso run: jos.iso
bochs -f bochsrc.conf -q bochs -f bochsrc.conf -q
clean: clean:
rm -rf *.o kernel.elf os.iso bochslog.txt rm -rf *.o kernel.elf jos.iso bochslog.txt