From cde825bed9722ef48d74e445b995e22e03101330 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 27 Sep 2016 21:20:14 -0600 Subject: [PATCH] Add redoxfs --- .gitmodules | 3 +++ Makefile | 19 +++++++++++++------ schemes/redoxfs | 1 + 3 files changed, 17 insertions(+), 6 deletions(-) create mode 160000 schemes/redoxfs diff --git a/.gitmodules b/.gitmodules index 5d13505..9a91e33 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "programs/coreutils"] path = programs/coreutils url = https://github.com/redox-os/coreutils.git +[submodule "schemes/redoxfs"] + path = schemes/redoxfs + url = https://github.com/redox-os/redoxfs diff --git a/Makefile b/Makefile index 7b4e165..5ae454e 100644 --- a/Makefile +++ b/Makefile @@ -155,10 +155,16 @@ initfs/bin/%: programs/coreutils/Cargo.toml programs/coreutils/src/bin/%.rs $(BU initfs/bin/%: schemes/%/Cargo.toml schemes/%/src/** $(BUILD)/libstd.rlib mkdir -p initfs/bin - $(CARGO) rustc --manifest-path $< $(CARGOFLAGS) -o $@ + $(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@ strip $@ rm $@.d +drivers: \ + initfs/bin/ahcid \ + initfs/bin/pcid \ + initfs/bin/ps2d \ + initfs/bin/vesad + coreutils: \ initfs/bin/cat \ initfs/bin/echo \ @@ -168,16 +174,17 @@ coreutils: \ initfs/bin/pwd \ initfs/bin/realpath +schemes: \ + initfs/bin/example \ + initfs/bin/redoxfs + $(BUILD)/initfs.rs: \ - initfs/bin/ahcid \ - initfs/bin/pcid \ - initfs/bin/ps2d \ - initfs/bin/vesad \ initfs/bin/init \ initfs/bin/ion \ initfs/bin/login \ + drivers \ coreutils \ - initfs/bin/example + schemes echo 'use collections::BTreeMap;' > $@ echo 'pub fn gen() -> BTreeMap<&'"'"'static [u8], (&'"'"'static [u8], bool)> {' >> $@ echo ' let mut files: BTreeMap<&'"'"'static [u8], (&'"'"'static [u8], bool)> = BTreeMap::new();' >> $@ diff --git a/schemes/redoxfs b/schemes/redoxfs new file mode 160000 index 0000000..11f3485 --- /dev/null +++ b/schemes/redoxfs @@ -0,0 +1 @@ +Subproject commit 11f3485173cf63d5beea42e9e1ce519d503c56a6