Add more utils
This commit is contained in:
parent
9f7bcf0f59
commit
be8cb1ff38
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -19,3 +19,6 @@
|
||||||
[submodule "schemes/redoxfs"]
|
[submodule "schemes/redoxfs"]
|
||||||
path = schemes/redoxfs
|
path = schemes/redoxfs
|
||||||
url = https://github.com/redox-os/redoxfs
|
url = https://github.com/redox-os/redoxfs
|
||||||
|
[submodule "programs/extrautils"]
|
||||||
|
path = programs/extrautils
|
||||||
|
url = https://github.com/redox-os/extrautils.git
|
||||||
|
|
44
Makefile
44
Makefile
|
@ -32,6 +32,7 @@ clean:
|
||||||
cargo clean --manifest-path programs/ion/Cargo.toml
|
cargo clean --manifest-path programs/ion/Cargo.toml
|
||||||
cargo clean --manifest-path programs/login/Cargo.toml
|
cargo clean --manifest-path programs/login/Cargo.toml
|
||||||
cargo clean --manifest-path programs/coreutils/Cargo.toml
|
cargo clean --manifest-path programs/coreutils/Cargo.toml
|
||||||
|
cargo clean --manifest-path programs/extrautils/Cargo.toml
|
||||||
cargo clean --manifest-path schemes/example/Cargo.toml
|
cargo clean --manifest-path schemes/example/Cargo.toml
|
||||||
cargo clean --manifest-path schemes/redoxfs/Cargo.toml
|
cargo clean --manifest-path schemes/redoxfs/Cargo.toml
|
||||||
rm -rf initfs/bin
|
rm -rf initfs/bin
|
||||||
|
@ -197,6 +198,12 @@ filesystem/bin/%: programs/coreutils/Cargo.toml programs/coreutils/src/bin/%.rs
|
||||||
strip $@
|
strip $@
|
||||||
rm $@.d
|
rm $@.d
|
||||||
|
|
||||||
|
filesystem/bin/%: programs/extrautils/Cargo.toml programs/extrautils/src/bin/%.rs $(BUILD)/libstd.rlib
|
||||||
|
mkdir -p filesystem/bin
|
||||||
|
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
|
||||||
|
strip $@
|
||||||
|
rm $@.d
|
||||||
|
|
||||||
filesystem/bin/%: schemes/%/Cargo.toml schemes/%/src/** $(BUILD)/libstd.rlib
|
filesystem/bin/%: schemes/%/Cargo.toml schemes/%/src/** $(BUILD)/libstd.rlib
|
||||||
mkdir -p filesystem/bin
|
mkdir -p filesystem/bin
|
||||||
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
|
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
|
||||||
|
@ -208,13 +215,47 @@ drivers: \
|
||||||
filesystem/bin/vesad
|
filesystem/bin/vesad
|
||||||
|
|
||||||
coreutils: \
|
coreutils: \
|
||||||
|
filesystem/bin/basename \
|
||||||
filesystem/bin/cat \
|
filesystem/bin/cat \
|
||||||
|
filesystem/bin/clear \
|
||||||
|
filesystem/bin/cp \
|
||||||
|
filesystem/bin/cut \
|
||||||
|
filesystem/bin/date \
|
||||||
|
filesystem/bin/du \
|
||||||
filesystem/bin/echo \
|
filesystem/bin/echo \
|
||||||
filesystem/bin/env \
|
filesystem/bin/env \
|
||||||
|
filesystem/bin/false \
|
||||||
|
filesystem/bin/head \
|
||||||
filesystem/bin/ls \
|
filesystem/bin/ls \
|
||||||
|
filesystem/bin/mkdir \
|
||||||
|
filesystem/bin/mv \
|
||||||
filesystem/bin/printenv \
|
filesystem/bin/printenv \
|
||||||
filesystem/bin/pwd \
|
filesystem/bin/pwd \
|
||||||
filesystem/bin/realpath
|
filesystem/bin/realpath \
|
||||||
|
filesystem/bin/reset \
|
||||||
|
filesystem/bin/rmdir \
|
||||||
|
filesystem/bin/rm \
|
||||||
|
filesystem/bin/seq \
|
||||||
|
filesystem/bin/sleep \
|
||||||
|
filesystem/bin/tail \
|
||||||
|
filesystem/bin/time \
|
||||||
|
filesystem/bin/touch \
|
||||||
|
filesystem/bin/true \
|
||||||
|
filesystem/bin/wc \
|
||||||
|
filesystem/bin/yes
|
||||||
|
#filesystem/bin/free filesystem/bin/ps filesystem/bin/shutdown filesystem/bin/test
|
||||||
|
|
||||||
|
extrautils: \
|
||||||
|
filesystem/bin/calc \
|
||||||
|
filesystem/bin/cksum \
|
||||||
|
filesystem/bin/cur \
|
||||||
|
filesystem/bin/grep \
|
||||||
|
filesystem/bin/less \
|
||||||
|
filesystem/bin/mdless \
|
||||||
|
filesystem/bin/mtxt \
|
||||||
|
filesystem/bin/rem \
|
||||||
|
#filesystem/bin/dmesg filesystem/bin/info filesystem/bin/man filesystem/bin/watch
|
||||||
|
|
||||||
|
|
||||||
schemes: \
|
schemes: \
|
||||||
filesystem/bin/example
|
filesystem/bin/example
|
||||||
|
@ -244,4 +285,3 @@ unmount: FORCE
|
||||||
sync
|
sync
|
||||||
-fusermount -u $(KBUILD)/harddrive/
|
-fusermount -u $(KBUILD)/harddrive/
|
||||||
rm -rf $(KBUILD)/harddrive/
|
rm -rf $(KBUILD)/harddrive/
|
||||||
|
|
||||||
|
|
2
libstd
2
libstd
|
@ -1 +1 @@
|
||||||
Subproject commit 29a6cab11d6e84c422917724ef0eca2bcc2c6589
|
Subproject commit 4dbfda17c3c2e2a0d88687a42151fc8a81f28ca0
|
1
programs/extrautils
Submodule
1
programs/extrautils
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 049f539aa40af8d1b0f93898a5967437c852d6ce
|
|
@ -1 +1 @@
|
||||||
Subproject commit 9c16bca2a56fea005c0bc16d9411adc590e0bbf8
|
Subproject commit 36b3cf04a9d35b85d481acdf99494fc535152cf0
|
Loading…
Reference in a new issue