vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Cleanup filesystem-live build target

Browse source
This commit is contained in:
Jeremy Soller 2022-02-10 13:32:05 -07:00
parent 9c175353fe
commit 061cee89e1
No known key found for this signature in database
GPG key ID: 87F211AF2BE4C2FE
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mk/disk.mk
View file

@ -7,11 +7,6 @@ build/harddrive.bin: build/filesystem.bin build/bootloader.bin
dd if=$< of=$@.partial bs=1M seek=1 conv=notrunc dd if=$< of=$@.partial bs=1M seek=1 conv=notrunc
mv $@.partial $@ 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 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) dd if=/dev/zero of=$@.partial bs=1M count=$$(expr $$(du -m $< | cut -f1) + 2)
$(PARTED) -s -a minimal $@.partial mklabel msdos $(PARTED) -s -a minimal $@.partial mklabel msdos

7
mk/filesystem.mk
View file

@ -20,8 +20,11 @@ build/filesystem.bin: filesystem.toml build/kernel prefix
rm -rf build/filesystem/ rm -rf build/filesystem/
mv $@.partial $@ mv $@.partial $@
build/filesystem-live.bin: build/livedisk build/filesystem-live.bin: build/kernel_live
cargo run --manifest-path redoxfs/Cargo.toml --release --bin redoxfs-ar -- $@.partial $< 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 $@ mv $@.partial $@
mount: FORCE mount: FORCE