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

Move installer/redoxfs submodule to redoxfs

Browse source
This commit is contained in:
Jeremy Soller 2017-06-29 18:14:28 -06:00
parent ba06b3cd98
commit e9a1765311
5 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -16,3 +16,6 @@
[submodule "rust"] [submodule "rust"]
path = rust path = rust
url = https://github.com/redox-os/rust.git url = https://github.com/redox-os/rust.git
[submodule "redoxfs"]
path = redoxfs
url = https://github.com/redox-os/redoxfs.git

4
Makefile
View file

@ -11,8 +11,8 @@ clean:
cd cookbook && ./clean.sh cd cookbook && ./clean.sh
cargo clean --manifest-path cookbook/pkgutils/Cargo.toml cargo clean --manifest-path cookbook/pkgutils/Cargo.toml
cargo clean --manifest-path installer/Cargo.toml cargo clean --manifest-path installer/Cargo.toml
cargo clean --manifest-path installer/redoxfs/Cargo.toml
cargo clean --manifest-path kernel/Cargo.toml cargo clean --manifest-path kernel/Cargo.toml
cargo clean --manifest-path redoxfs/Cargo.toml
-$(FUMOUNT) build/filesystem/ || true -$(FUMOUNT) build/filesystem/ || true
rm -rf build rm -rf build
@ -27,8 +27,8 @@ pull:
update: update:
cargo update --manifest-path cookbook/pkgutils/Cargo.toml cargo update --manifest-path cookbook/pkgutils/Cargo.toml
cargo update --manifest-path installer/Cargo.toml cargo update --manifest-path installer/Cargo.toml
cargo update --manifest-path installer/redoxfs/Cargo.toml
cargo update --manifest-path kernel/Cargo.toml cargo update --manifest-path kernel/Cargo.toml
cargo update --manifest-path redoxfs/Cargo.toml
# Emulation recipes # Emulation recipes
include mk/qemu.mk include mk/qemu.mk

2
installer

@ -1 +1 @@
Subproject commit f99fac30ea7bd69f04e6f2ac67bf4d197c7b91de Subproject commit d6f2936a5337b3c613483ea428dc6c4571e5357c

10
mk/filesystem.mk
View file

@ -2,10 +2,10 @@ 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=512
cargo run --manifest-path installer/redoxfs/Cargo.toml --quiet --release --bin redoxfs-mkfs $@.partial cargo run --manifest-path redoxfs/Cargo.toml --quiet --release --bin redoxfs-mkfs $@.partial
mkdir -p build/filesystem/ mkdir -p build/filesystem/
cargo build --manifest-path installer/redoxfs/Cargo.toml --quiet --release --bin redoxfs cargo build --manifest-path redoxfs/Cargo.toml --quiet --release --bin redoxfs
cargo run --manifest-path installer/redoxfs/Cargo.toml --quiet --release --bin redoxfs -- $@.partial build/filesystem/ cargo run --manifest-path redoxfs/Cargo.toml --quiet --release --bin redoxfs -- $@.partial build/filesystem/
sleep 2 sleep 2
pgrep redoxfs pgrep redoxfs
cp build/kernel build/filesystem/kernel cp build/kernel build/filesystem/kernel
@ -32,8 +32,8 @@ build/filesystem.bin: filesystem.toml build/kernel
mount: FORCE mount: FORCE
mkdir -p build/filesystem/ mkdir -p build/filesystem/
cargo build --manifest-path installer/redoxfs/Cargo.toml --quiet --release --bin redoxfs cargo build --manifest-path redoxfs/Cargo.toml --quiet --release --bin redoxfs
cargo run --manifest-path installer/redoxfs/Cargo.toml --quiet --release --bin redoxfs -- build/harddrive.bin build/filesystem/ cargo run --manifest-path redoxfs/Cargo.toml --quiet --release --bin redoxfs -- build/harddrive.bin build/filesystem/
sleep 2 sleep 2
pgrep redoxfs pgrep redoxfs

1
redoxfs Submodule

@ -0,0 +1 @@
Subproject commit 97652cc6f85bc31a556706d882554a8b71299807