Compare commits

..

No commits in common. "10c92cef6171cecd77d66c3dd1e048fa6e197e1e" and "3fd86aad4f6bd4b459a9cb950c6b59e49d9829de" have entirely different histories.

3 changed files with 5 additions and 5 deletions

@ -1 +1 @@
Subproject commit ec14ff801c89954196a9d86e4d13176eeb84ab9e
Subproject commit 59a373b438b803e49adba3f7efd9b985d60e3415

2
kernel

@ -1 +1 @@
Subproject commit 8f06672153c17fc6b7f9ed5d57a220164360b7e2
Subproject commit 3d21fc6bba7e07e9551a2416d9c2a366eb86ed44

View File

@ -1,4 +1,4 @@
build/filesystem.bin: prefix filesystem.toml build/bootloader.bin build/kernel build/initfs.img
build/filesystem.bin: filesystem.toml build/bootloader.bin build/kernel prefix build/initfs.img
cargo build --manifest-path cookbook/Cargo.toml --release
cargo build --manifest-path installer/Cargo.toml --release
cargo build --manifest-path redoxfs/Cargo.toml --release
@ -13,14 +13,14 @@ build/filesystem.bin: prefix filesystem.toml build/bootloader.bin build/kernel b
redoxfs/target/release/redoxfs $@.partial build/filesystem/
sleep 2
pgrep redoxfs
cp -v filesystem.toml build/filesystem/filesystem.toml
cp -v $< build/filesystem/filesystem.toml
cp -v build/bootloader.bin build/filesystem/bootloader
cp -v build/kernel build/filesystem/kernel
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 filesystem.toml build/filesystem/
$(INSTALLER) -c $< build/filesystem/
cp build/initfs.img build/filesystem/initfs
sync
-$(FUMOUNT) build/filesystem/ || true