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

Add files needed for installation to filesystem, do not copy dynamic linking files

Browse source
This commit is contained in:
Jeremy Soller 2022-03-23 13:54:48 -06:00
parent 1f6e1c9676
commit 7ac5196528
No known key found for this signature in database
GPG key ID: 87F211AF2BE4C2FE
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
mk/filesystem.mk
View file

@ -1,10 +1,10 @@
build/filesystem.bin: filesystem.toml build/kernel prefix build/filesystem.bin: filesystem.toml build/bootloader.bin build/kernel prefix
cargo build --manifest-path cookbook/Cargo.toml --release cargo build --manifest-path cookbook/Cargo.toml --release
cargo build --manifest-path installer/Cargo.toml --release cargo build --manifest-path installer/Cargo.toml --release
cargo build --manifest-path redoxfs/Cargo.toml --release cargo build --manifest-path redoxfs/Cargo.toml --release
-$(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="$(FILESYSTEM_SIZE)" fallocate --posix --length "$(FILESYSTEM_SIZE)MiB" $@.partial
cargo run --release \ cargo run --release \
--manifest-path redoxfs/Cargo.toml \ --manifest-path redoxfs/Cargo.toml \
--bin redoxfs-mkfs \ --bin redoxfs-mkfs \
@ -13,10 +13,13 @@ build/filesystem.bin: filesystem.toml build/kernel prefix
redoxfs/target/release/redoxfs $@.partial build/filesystem/ redoxfs/target/release/redoxfs $@.partial build/filesystem/
sleep 2 sleep 2
pgrep redoxfs pgrep redoxfs
cp $< build/filesystem/filesystem.toml cp -v $< build/filesystem/filesystem.toml
cp build/kernel build/filesystem/kernel cp -v build/bootloader.bin build/filesystem/bootloader
cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/include build/filesystem/include cp -v build/kernel build/filesystem/kernel
cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib build/filesystem/lib mkdir -v build/filesystem/pkg
cp -v cookbook/build/id_ed25519.pub.toml build/filesystem/pkg/id_ed25519.pub.toml
#TODO cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/include build/filesystem/include
#TODO cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib build/filesystem/lib
$(INSTALLER) -c $< build/filesystem/ $(INSTALLER) -c $< build/filesystem/
sync sync
-$(FUMOUNT) build/filesystem/ || true -$(FUMOUNT) build/filesystem/ || true