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

New method of linking live filesystem

Browse source 
Downsize live filesystem to 256 MB
This commit is contained in:
Jeremy Soller 2017-09-19 20:36:44 -06:00
parent 44f776f67a
commit 345c6bc434
3 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel

@ -1 +1 @@
Subproject commit 1f81866afafd5a3830c078c0ad8921b5316c0248 Subproject commit d6b9768dc3e9cd967df0acf3eafb10d02c9f0ba6

2
mk/filesystem.mk
View file

@ -1,7 +1,7 @@
build/filesystem.bin: filesystem.toml build/kernel build/filesystem.bin: filesystem.toml build/kernel
-$(FUMOUNT) build/filesystem/ || true -$(FUMOUNT) build/filesystem/ || true
rm -rf $@ $@.partial build/filesystem/ rm -rf $@ $@.partial build/filesystem/
dd if=/dev/zero of=$@.partial bs=1048576 count=512 dd if=/dev/zero of=$@.partial bs=1048576 count=256
cargo run --manifest-path redoxfs/Cargo.toml --release --bin redoxfs-mkfs $@.partial cargo run --manifest-path redoxfs/Cargo.toml --release --bin redoxfs-mkfs $@.partial
mkdir -p build/filesystem/ mkdir -p build/filesystem/
cargo build --manifest-path redoxfs/Cargo.toml --release --bin redoxfs cargo build --manifest-path redoxfs/Cargo.toml --release --bin redoxfs

19
mk/kernel.mk
View file

@ -6,11 +6,18 @@ else
cd kernel && xargo rustc --lib --target $(KTARGET) --release -- -C soft-float --emit link=../$@ cd kernel && xargo rustc --lib --target $(KTARGET) --release -- -C soft-float --emit link=../$@
endif endif
build/libkernel_live.a: kernel/Cargo.toml kernel/src/* kernel/src/*/* kernel/src/*/*/* build/initfs.tag build/filesystem.bin build/libkernel_live.a: kernel/Cargo.toml kernel/src/* kernel/src/*/* kernel/src/*/*/* build/initfs.tag
cd kernel && FILESYSTEM="$(PWD)/build/filesystem.bin" xargo rustc --lib --features live --target $(KTARGET) --release -- -C soft-float --emit link=../$@ cd kernel && xargo rustc --lib --features live --target $(KTARGET) --release -- -C soft-float --emit link=../$@
build/kernel: build/libkernel.a kernel/linkers/$(ARCH).ld build/kernel: kernel/linkers/$(ARCH).ld build/libkernel.a
$(LD) --gc-sections -z max-page-size=0x1000 -T kernel/linkers/$(ARCH).ld -o $@ $< $(LD) --gc-sections -z max-page-size=0x1000 -T $< -o $@ build/libkernel.a
build/kernel_live: build/libkernel_live.a kernel/linkers/$(ARCH).ld build/kernel_live: kernel/linkers/$(ARCH).ld build/libkernel_live.a build/live.o
$(LD) --gc-sections -z max-page-size=0x1000 -T kernel/linkers/$(ARCH).ld -o $@ $< $(LD) --gc-sections -z max-page-size=0x1000 -T $< -o $@ build/libkernel_live.a build/live.o
build/live.o: build/filesystem.bin
#TODO: More general use of $(ARCH)
objcopy -I binary -O elf64-x86-64 -B i386:x86-64 $< $@ \
--redefine-sym _binary_build_filesystem_bin_start=__live_start \
--redefine-sym _binary_build_filesystem_bin_end=__live_end \
--redefine-sym _binary_build_filesystem_bin_size=__live_size