From 73f27f730b3c4c8b60b018db0067f1c7cf79be93 Mon Sep 17 00:00:00 2001 From: kamkow1 Date: Sat, 30 Aug 2025 23:52:53 +0200 Subject: [PATCH] Clean up Makefile, move stuff into separate scripts --- Makefile | 23 ++--------------------- devel.sh => scripts/devel.sh | 0 scripts/mkbaseimg.sh | 6 ++++++ scripts/mkiso.sh | 19 +++++++++++++++++++ 4 files changed, 27 insertions(+), 21 deletions(-) rename devel.sh => scripts/devel.sh (100%) create mode 100755 scripts/mkbaseimg.sh create mode 100755 scripts/mkiso.sh diff --git a/Makefile b/Makefile index 756660c..10f891f 100644 --- a/Makefile +++ b/Makefile @@ -20,26 +20,7 @@ clean: rm -f mop2.iso base.img base: - @rm -f base.img - @rm -rf base_root - @mkdir -p base_root - mklittlefs -c base_root -b 4096 -s $$((1<<20)) base.img + ./scripts/mkbaseimg.sh iso: - @rm -rf iso_root - @mkdir -p iso_root/boot - @cp -v kernel/mop2 iso_root/boot - @cp -v base.img iso_root - @mkdir -p iso_root/boot/limine - @cp -v limine.conf limine/limine-bios.sys limine/limine-bios-cd.bin \ - limine/limine-uefi-cd.bin iso_root/boot/limine - @mkdir -p iso_root/EFI/BOOT - @cp -v limine/BOOTX64.EFI iso_root/EFI/BOOT - @cp -v limine/BOOTIA32.EFI iso_root/EFI/BOOT - @xorriso -as mkisofs -R -r -J -b boot/limine/limine-bios-cd.bin \ - -no-emul-boot -boot-load-size 4 -boot-info-table -hfsplus \ - -apm-block-size 2048 --efi-boot boot/limine/limine-uefi-cd.bin \ - -efi-boot-part --efi-boot-image --protective-msdos-label \ - iso_root -o mop2.iso - @./limine/limine bios-install mop2.iso - + ./scripts/mkiso.sh diff --git a/devel.sh b/scripts/devel.sh similarity index 100% rename from devel.sh rename to scripts/devel.sh diff --git a/scripts/mkbaseimg.sh b/scripts/mkbaseimg.sh new file mode 100755 index 0000000..687ee6a --- /dev/null +++ b/scripts/mkbaseimg.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +rm -f base.img +rm -rf base_root +mkdir -p base_root +mklittlefs -c base_root -b 4096 -s $((1<<20)) base.img diff --git a/scripts/mkiso.sh b/scripts/mkiso.sh new file mode 100755 index 0000000..5a1044b --- /dev/null +++ b/scripts/mkiso.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +rm -rf iso_root +mkdir -p iso_root/boot +cp -v kernel/mop2 iso_root/boot +cp -v base.img iso_root +mkdir -p iso_root/boot/limine +cp -v limine.conf limine/limine-bios.sys limine/limine-bios-cd.bin \ + limine/limine-uefi-cd.bin iso_root/boot/limine +mkdir -p iso_root/EFI/BOOT +cp -v limine/BOOTX64.EFI iso_root/EFI/BOOT +cp -v limine/BOOTIA32.EFI iso_root/EFI/BOOT +xorriso -as mkisofs -R -r -J -b boot/limine/limine-bios-cd.bin \ + -no-emul-boot -boot-load-size 4 -boot-info-table -hfsplus \ + -apm-block-size 2048 --efi-boot boot/limine/limine-uefi-cd.bin \ + -efi-boot-part --efi-boot-image --protective-msdos-label \ + iso_root -o mop2.iso +./limine/limine bios-install mop2.iso +