justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Update ISO make tartget to xorrisofs

Browse Source
This commit is contained in:
Justin C. Miller
2018-04-30 20:27:37 -07:00
parent 7009bb6d05
commit 6c3bbaa686
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -217,17 +217,17 @@ $(BUILD_D)/fs.img: $(BUILD_D)/boot.efi $(BUILD_D)/kernel.elf $(BUILD_D)/screenfo
rm $(TEMPFILE) rm $(TEMPFILE)
mv $@.tmp $@ mv $@.tmp $@
$(BUILD_D)/fs.iso: $(BUILD_D)/fs.img
mkdir -p $(BUILD_D)/iso
cp $< $(BUILD_D)/iso/
xorriso -as mkisofs -R -f -e fs.img -no-emul-boot -o $@ $(BUILD_D)/iso
$(BUILD_D)/floppy.img: $(BUILD_D)/boot.efi $(BUILD_D)/kernel.elf $(BUILD_D)/screenfont.psf $(BUILD_D)/floppy.img: $(BUILD_D)/boot.efi $(BUILD_D)/kernel.elf $(BUILD_D)/screenfont.psf
cp assets/floppy.img $@ cp assets/floppy.img $@
mcopy -i $@ $(BUILD_D)/boot.efi ::/EFI/BOOT/BOOTX64.efi mcopy -i $@ $(BUILD_D)/boot.efi ::/EFI/BOOT/BOOTX64.efi
mcopy -i $@ $(BUILD_D)/kernel.elf ::$(KERNEL_FILENAME) mcopy -i $@ $(BUILD_D)/kernel.elf ::$(KERNEL_FILENAME)
mcopy -i $@ $(BUILD_D)/screenfont.psf ::screenfont.psf mcopy -i $@ $(BUILD_D)/screenfont.psf ::screenfont.psf
$(BUILD_D)/fs.iso: $(BUILD_D)/floppy.img
mkdir -p $(BUILD_D)/iso
cp $< $(BUILD_D)/iso/
xorrisofs --efi-boot floppy.img -o $@ $(BUILD_D)/iso
qemu: $(BUILD_D)/floppy.img $(BUILD_D)/flash.img qemu: $(BUILD_D)/floppy.img $(BUILD_D)/flash.img
-rm popcorn.log -rm popcorn.log
"$(QEMU)" $(QEMUOPTS) -nographic "$(QEMU)" $(QEMUOPTS) -nographic