Merge branch 'relibc'
This commit is contained in:
commit
e1b7b0e8cb
1 changed files with 156 additions and 63 deletions
|
|
@ -1,4 +1,4 @@
|
|||
build/filesystem.bin: filesystem.toml build/bootloader build/kernel
|
||||
build/filesystem.bin: filesystem.toml build/bootloader build/kernel prefix
|
||||
-$(FUMOUNT) build/filesystem/ || true
|
||||
rm -rf $@ $@.partial build/filesystem/
|
||||
dd if=/dev/zero of=$@.partial bs=1048576 count=256
|
||||
|
|
@ -8,7 +8,10 @@ build/filesystem.bin: filesystem.toml build/bootloader build/kernel
|
|||
cargo run --manifest-path redoxfs/Cargo.toml --release --bin redoxfs -- $@.partial build/filesystem/
|
||||
sleep 2
|
||||
pgrep redoxfs
|
||||
cp filesystem.toml build/bootloader build/kernel build/filesystem/
|
||||
cp $< build/filesystem/filesystem.toml
|
||||
cp build/bootloader build/filesystem/bootloader
|
||||
cp build/kernel build/filesystem/kernel
|
||||
export PATH="$(PREFIX_PATH):$$PATH" && \
|
||||
cargo run --manifest-path installer/Cargo.toml --release -- $(INSTALLER_FLAGS) -c $< build/filesystem/
|
||||
sync
|
||||
-$(FUMOUNT) build/filesystem/ || true
|
||||
|
|
|
|||
Loading…
Reference in a new issue