diff --git a/.gitmodules b/.gitmodules index f7f04bf..8ca1a0a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,3 +40,6 @@ [submodule "filesystem/ui"] path = filesystem/ui url = https://github.com/redox-os/orbdata.git +[submodule "programs/acid"] + path = programs/acid + url = https://github.com/redox-os/acid.git diff --git a/Makefile b/Makefile index 19de26e..76afcf5 100644 --- a/Makefile +++ b/Makefile @@ -233,6 +233,9 @@ filesystem/bin/%: programs/%/Cargo.toml programs/%/src/** $(BUILD)/libstd.rlib strip $@ rm $@.d +filesystem/bin/sh: filesystem/bin/ion + cp $< $@ + filesystem/bin/%: programs/coreutils/Cargo.toml programs/coreutils/src/bin/%.rs $(BUILD)/libstd.rlib mkdir -p filesystem/bin $(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@ @@ -359,7 +362,9 @@ $(BUILD)/filesystem.bin: \ orbutils \ userutils \ schemes \ + filesystem/bin/acid \ filesystem/bin/ion \ + filesystem/bin/sh \ filesystem/bin/smith rm -rf $@ $(BUILD)/filesystem/ echo exit | cargo run --manifest-path schemes/redoxfs/Cargo.toml --bin redoxfs-utility $@ 64 diff --git a/programs/acid b/programs/acid new file mode 160000 index 0000000..e38c225 --- /dev/null +++ b/programs/acid @@ -0,0 +1 @@ +Subproject commit e38c225aab948f92444f904a9116ff9574c05954