mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-10-27 12:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

update jinx

Browse Source
This commit is contained in:
Matheus
2025-09-09 20:22:45 -03:00
parent be65c6d832
commit e6265552bd
43 changed files with 187 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+64 -47
View File
@@ -1,22 +1,24 @@
ISODIR=$(shell pwd)/iso
IMGDIR=$(shell pwd)/img
ISO=astral.iso
IMG=astral-bootable.img
DISKNAME=hdd.img
LIMINEDIR=$(shell pwd)/host-pkgs/limine/usr/local/share/limine/
KERNEL=$(shell pwd)/builds/astral/astral
QEMUFLAGS=-M q35 -m 4g -smp cpus=1 -no-shutdown -no-reboot -monitor stdio -debugcon file:/dev/stdout -serial file:/dev/stdout -netdev user,id=net0 -device virtio-net,netdev=net0 -object filter-dump,id=f1,netdev=net0,file=netdump.dat
JINX_ARCH=x86_64
JINX_DIR=$(shell pwd)/build-$(JINX_ARCH)
ISODIR=$(JINX_DIR)/iso
IMGDIR=$(JINX_DIR)/img
ISO=$(JINX_DIR)/astral.iso
IMG=$(JINX_DIR)/astral-bootable.img
DISKNAME=$(JINX_DIR)/hdd.img
LIMINEDIR=$(JINX_DIR)/host-pkgs/limine/usr/local/share/limine/
KERNEL=$(JINX_DIR)/builds/astral/astral
QEMUFLAGS=-M q35 -m 2g -smp cpus=4 -no-shutdown -no-reboot -debugcon file:/dev/stdout -serial stdio -netdev user,id=net0 -device virtio-net,netdev=net0 -object filter-dump,id=f1,netdev=net0,file=netdump.dat
QEMUISOFLAGS=-cdrom $(ISO)
QEMUDISKFLAGS=-drive file=$(DISKNAME),if=none,id=nvme -device nvme,serial=deadc0ff,drive=nvme -boot order=dc
QEMUDISKFLAGS=-drive file=$(DISKNAME),if=none,id=nvme -device virtio-blk,serial=deadc0ff,drive=nvme -boot order=dc
QEMUIMGFLAGS=-drive file=$(IMG),if=none,id=usb -device nec-usb-xhci,id=xhci -device usb-storage,bus=xhci.0,drive=usb,removable=on
INITRD=$(shell pwd)/initrds/initrd
INITRD=$(JINX_DIR)/initrds/initrd
DISTROTYPE=full
MINIMALPACKAGES=mlibc bash coreutils init distro-files vim nano mount netd shadow sudo neofetch
.PHONY: all kernel clean clean-kernel iso img initrd full minimal disk
.PHONY: all kernel clean clean-kernel iso img initrd full minimal disk distro-minimal distro-full
all: jinx
all: $(JINX_DIR)/.astral_ok
git submodule update --init --recursive
mkdir -p $(ISODIR)
make kernel
@@ -30,9 +32,15 @@ all: jinx
@echo
jinx:
curl https://astral-os.org/jinx > jinx
curl https://codeberg.org/Mintsuki/jinx/raw/commit/fba7f3150aa0bd13d27161968b1f441836d06279/jinx > jinx
chmod +x jinx
$(JINX_DIR)/.astral_ok: jinx
mkdir -p $(JINX_DIR)
cd $(JINX_DIR) && \
../jinx init .. ARCH=$(JINX_ARCH) && \
touch .astral_ok
iso: $(ISO)
img: $(IMG)
@@ -48,64 +56,69 @@ $(IMG): limine.conf liminebg.bmp $(KERNEL) $(INITRD)-$(DISTROTYPE)
cp $(KERNEL) liminebg.bmp limine.conf $(LIMINEDIR)/limine-bios.sys $(IMGDIR)
cp $(LIMINEDIR)/BOOTIA32.EFI $(IMGDIR)/EFI/BOOT
cp $(LIMINEDIR)/BOOTX64.EFI $(IMGDIR)/EFI/BOOT
./genbootimg.sh 1G $(IMG) $(IMGDIR)
../genbootimg.sh 200m $(IMG) $(IMGDIR)
# ------ build targets ------
kernel:
rm -f builds/astral.packaged
rm -f builds/astral.built
./jinx build astral
cd $(JINX_DIR) && \
rm -f builds/astral.packaged && \
rm -f builds/astral.built && \
../jinx build astral
distro-minimal:
cd $(JINX_DIR) && \
../jinx build-if-needed $(MINIMALPACKAGES)
distro-full:
cd $(JINX_DIR) && \
../jinx build-if-needed '*'
# ------ initrd targets ------
$(INITRD)-full:
./jinx install sysroot \*
mkdir -p initrds
./geninitrd.sh sysroot $(INITRD)-full
$(INITRD)-full: distro-full
cd $(JINX_DIR) && \
../jinx install sysroot \* && \
mkdir -p initrds && \
../geninitrd.sh sysroot $(INITRD)-full
$(INITRD)-minimal:
./jinx install minimalsysroot $(MINIMALPACKAGES)
mkdir -p initrds
./geninitrd.sh minimalsysroot $(INITRD)-minimal
$(INITRD)-minimal: distro-minimal
cd $(JINX_DIR) && \
../jinx install minimalsysroot $(MINIMALPACKAGES) && \
mkdir -p initrds && \
../geninitrd.sh minimalsysroot $(INITRD)-minimal
initrd:
rm $(INITRD)-$(DISTROTYPE)
cd $(JINX_DIR) && \
rm $(INITRD)-$(DISTROTYPE) && \
make $(INITRD)-$(DISTROTYPE)
# ------ disk targets ------
disk: disk-$(DISTROTYPE)
disk-full:
./jinx install sysroot \*
./gendisk.sh 4g sysroot $(DISKNAME)
disk-full: distro-full
cd $(JINX_DIR) && \
../jinx install sysroot \* && \
../gendisk.sh 8g sysroot $(DISKNAME)
disk-minimal:
./jinx install minimalsysroot $(MINIMALPACKAGES)
./gendisk.sh 1g minimalsysroot $(DISKNAME)
disk-minimal: distro-minimal
cd $(JINX_DIR) && \
../jinx install minimalsysroot $(MINIMALPACKAGES) && \
../gendisk.sh 1g minimalsysroot $(DISKNAME)
# ------ clean targets ------
clean-kernel:
find builds/astral/ -name *.d -delete
find builds/astral/ -name *.o -delete
cd $(JINX_DIR) && \
find builds/astral/ -name *.d -delete && \
find builds/astral/ -name *.o -delete && \
find builds/astral/ -name *.asmo -delete
clean:
make -i clean-kernel
rm jinx
rm -rf builds
rm -rf host-builds
rm -rf pkgs
rm -rf host-pkgs
rm -rf jinx
rm -rf sources
rm -rf sysroot
rm -rf $(ISODIR)
rm -f $(ISO)
rm -f $(DISKNAME)
rm -rf initrds
rm -rf $(JINX_DIR)
# ------ run targets ------
run:
@@ -124,7 +137,11 @@ run-disk-gdb:
qemu-system-x86_64 $(QEMUFLAGS) $(QEMUISOFLAGS) $(QEMUDISKFLAGS) -S -s
run-disk-kvm:
qemu-system-x86_64 $(QEMUFLAGS) $(QEMUISOFLAGS) $(QEMUDISKFLAGS) -enable-kvm -cpu host,migratable=off
qemu-system-x86_64 $(QEMUFLAGS) $(QEMUISOFLAGS) $(QEMUDISKFLAGS) -enable-kvm -cpu host,migratable=off -s
run-disk-kvm-gdb:
qemu-system-x86_64 $(QEMUFLAGS) $(QEMUISOFLAGS) $(QEMUDISKFLAGS) -enable-kvm -cpu host,migratable=off -S -s
run-img:
qemu-system-x86_64 $(QEMUFLAGS) $(QEMUIMGFLAGS)