diff --git a/mk/disk.mk b/mk/disk.mk index 95c24e6..819f603 100644 --- a/mk/disk.mk +++ b/mk/disk.mk @@ -7,11 +7,6 @@ build/harddrive.bin: build/filesystem.bin build/bootloader.bin dd if=$< of=$@.partial bs=1M seek=1 conv=notrunc mv $@.partial $@ -build/livedisk: build/kernel_live - mkdir -p $@.partial - cp $< $@.partial/kernel - mv $@.partial $@ - build/livedisk.bin: build/filesystem-live.bin build/bootloader.bin dd if=/dev/zero of=$@.partial bs=1M count=$$(expr $$(du -m $< | cut -f1) + 2) $(PARTED) -s -a minimal $@.partial mklabel msdos diff --git a/mk/filesystem.mk b/mk/filesystem.mk index 89f279a..bc4ad45 100644 --- a/mk/filesystem.mk +++ b/mk/filesystem.mk @@ -20,8 +20,11 @@ build/filesystem.bin: filesystem.toml build/kernel prefix rm -rf build/filesystem/ mv $@.partial $@ -build/filesystem-live.bin: build/livedisk - cargo run --manifest-path redoxfs/Cargo.toml --release --bin redoxfs-ar -- $@.partial $< +build/filesystem-live.bin: build/kernel_live + rm -rf $@ $@.partial build/filesystem-live/ + mkdir -p build/filesystem-live/ + cp $< build/filesystem-live/kernel + cargo run --manifest-path redoxfs/Cargo.toml --release --bin redoxfs-ar -- $@.partial build/filesystem-live mv $@.partial $@ mount: FORCE