mara/redox
Watch
0
0
Fork
You've already forked redox
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor of disk image handling

Browse source
This commit is contained in:
Jeremy Soller 2022-09-07 08:28:12 -06:00
commit 087825fa8b
No known key found for this signature in database
GPG key ID: 87F211AF2BE4C2FE
1 changed files with 44 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

18
mk/disk.mk
View file

@ -1,4 +1,4 @@
build/harddrive.bin: $(FILESYSTEM_CONFIG)
build/harddrive.img: $(FILESYSTEM_CONFIG)
$(HOST_CARGO) build --manifest-path installer/Cargo.toml --release
mkdir -p build
rm -rf $@ $@.partial
@ -6,7 +6,7 @@ build/harddrive.bin: $(FILESYSTEM_CONFIG)
$(INSTALLER) -c $(FILESYSTEM_CONFIG) $@.partial
mv $@.partial $@
build/livedisk.bin: $(FILESYSTEM_CONFIG)
build/livedisk.iso: $(FILESYSTEM_CONFIG)
$(HOST_CARGO) build --manifest-path installer/Cargo.toml --release
mkdir -p build
rm -rf $@ $@.partial
@ -14,27 +14,17 @@ build/livedisk.bin: $(FILESYSTEM_CONFIG)
$(INSTALLER) -c $(FILESYSTEM_CONFIG) --live $@.partial
mv $@.partial $@
build/livedisk.iso: build/livedisk.bin
rm -rf build/iso/ $@.partial
mkdir -p build/iso/
cp -v $< build/iso/livedisk.bin
genisoimage -o $@.partial \
-hard-disk-boot \
-b livedisk.bin \
build/iso/
mv $@.partial $@
mount: FORCE
mkdir -p build/filesystem/
$(HOST_CARGO) build --manifest-path redoxfs/Cargo.toml --release --bin redoxfs
redoxfs/target/release/redoxfs build/harddrive.bin build/filesystem/
redoxfs/target/release/redoxfs build/harddrive.img build/filesystem/
sleep 2
pgrep redoxfs
mount_extra: FORCE
mkdir -p build/filesystem/
$(HOST_CARGO) build --manifest-path redoxfs/Cargo.toml --release --bin redoxfs
redoxfs/target/release/redoxfs build/extra.bin build/filesystem/
redoxfs/target/release/redoxfs build/extra.img build/filesystem/
sleep 2
pgrep redoxfs