misc(makefile): cleanup

Signed-off-by: Anhad Singh <[email protected]>

Author: Andy-Python-Programmer

Makefile

@@ -26,15 +26,15 @@ USERLAND_TARGET := builds/userland/target/init
 
 .PHONY: clean
 clean:
-	rm -rf src/target
+	rm -rf $(SOURCE_DIR)/target
 
 .PHONY: check
 check:	
-	cd src && cargo check
+	cd $(SOURCE_DIR) && cargo check
 
 $(KERNEL_TARGET): $(shell find $(SOURCE_DIR) -type f -not -path '$(SOURCE_DIR)/target/*')
-	cd src && cargo build --package aero_kernel --profile $(profile)
-	./build-support/mkiso.sh
+	cd $(SOURCE_DIR) && cargo build --package aero_kernel --profile $(profile)
+	./build-support/mkiso.sh $(KERNEL_TARGET)
 
 $(USERLAND_TARGET): $(shell find $(USERLAND_DIR) -type f -not -path '$(USERLAND_DIR)/target/*')
 	./target/jinx rebuild userland
@@ -53,9 +53,13 @@ QEMU_PATH ?= $(shell dirname $(shell which qemu-system-x86_64))
 qemu: $(KERNEL_TARGET) $(USERLAND_TARGET)
 	${QEMU_PATH}/qemu-system-x86_64 -cdrom target/aero.iso -m 8G -serial stdio --boot d -s -enable-kvm -cpu host,+vmx -drive file=target/disk.img,if=none,id=NVME1,format=raw -device nvme,drive=NVME1,serial=nvme 
 
+# "qemu_perf" options:
+# 	delay (default: 30) - the amount of microseconds between each sample.
+delay ?= 30
+
 .PHONY: qemu_perf
 qemu_perf: $(KERNEL_TARGET) $(USERLAND_TARGET)
-	${QEMU_PATH}/qemu-system-x86_64 -cdrom target/aero.iso -m 8G -serial stdio --boot d -s -drive file=target/disk.img,if=none,id=NVME1,format=raw -device nvme,drive=NVME1,serial=nvme -plugin './target/kern-profile.so,out=raw-data,delay=25' -d plugin -cpu max
+	${QEMU_PATH}/qemu-system-x86_64 -cdrom target/aero.iso -m 8G -serial stdio --boot d -s -drive file=target/disk.img,if=none,id=NVME1,format=raw -device nvme,drive=NVME1,serial=nvme -plugin './target/kern-profile.so,out=raw-data,delay=$(delay)' -d plugin -cpu max
 
 .PHONY: qemu_p
 qemu_p:

build-support/mkiso.sh

@@ -5,7 +5,7 @@ set -ex
 rm -rf target/iso_root
 mkdir -pv target/iso_root/boot
 
-cp src/target/x86_64-unknown-none/release/aero_kernel target/iso_root/aero
+cp $1 target/iso_root/aero
 cp build-support/limine.cfg src/.cargo/term_background.bmp target/iso_root/
 
 # Install the limine binaries