From 1ee388be2a3a407577d42336a405f157da099892 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Tue, 18 Oct 2016 17:13:26 -0600
Subject: [PATCH] Add tar and pkgutils. Disable arpd and orbital on start to
 improve start time

---
 .gitmodules            |  6 ++++++
 Makefile               | 18 ++++++++++++++++--
 filesystem/etc/init.rc |  4 ++--
 programs/acid          |  2 +-
 programs/ion           |  2 +-
 programs/orbutils      |  2 +-
 programs/pkgutils      |  1 +
 programs/tar           |  1 +
 8 files changed, 29 insertions(+), 7 deletions(-)
 create mode 160000 programs/pkgutils
 create mode 160000 programs/tar

diff --git a/.gitmodules b/.gitmodules
index 20ff0a0..af4ee9a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -43,3 +43,9 @@
 [submodule "programs/acid"]
 	path = programs/acid
 	url = https://github.com/redox-os/acid.git
+[submodule "programs/tar"]
+	path = programs/tar
+	url = https://github.com/redox-os/tar-rs.git
+[submodule "programs/pkgutils"]
+	path = programs/pkgutils
+	url = https://github.com/redox-os/pkgutils.git
diff --git a/Makefile b/Makefile
index bc39f79..972daae 100644
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,7 @@ clean:
 	cargo clean --manifest-path programs/orbutils/Cargo.toml
 	cargo clean --manifest-path programs/userutils/Cargo.toml
 	cargo clean --manifest-path programs/smith/Cargo.toml
+	cargo clean --manifest-path programs/tar/Cargo.toml
 	cargo clean --manifest-path schemes/ethernetd/Cargo.toml
 	cargo clean --manifest-path schemes/example/Cargo.toml
 	cargo clean --manifest-path schemes/ipd/Cargo.toml
@@ -85,6 +86,7 @@ update:
 	cargo update --manifest-path programs/orbutils/Cargo.toml
 	cargo update --manifest-path programs/userutils/Cargo.toml
 	cargo update --manifest-path programs/smith/Cargo.toml
+	cargo update --manifest-path programs/tar/Cargo.toml
 	cargo update --manifest-path schemes/ethernetd/Cargo.toml
 	cargo update --manifest-path schemes/example/Cargo.toml
 	cargo update --manifest-path schemes/ipd/Cargo.toml
@@ -265,7 +267,7 @@ filesystem/bin/%: drivers/%/Cargo.toml drivers/%/src/** $(BUILD)/libstd.rlib
 
 filesystem/bin/%: programs/%/Cargo.toml programs/%/src/** $(BUILD)/libstd.rlib
 	mkdir -p filesystem/bin
-	$(CARGO) rustc --manifest-path $< $(CARGOFLAGS) -o $@
+	$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
 	strip $@
 	rm $@.d
 
@@ -296,6 +298,13 @@ filesystem/bin/%: programs/orbutils/Cargo.toml programs/orbutils/src/%/**.rs $(B
 	strip $@
 	rm $@.d
 
+filesystem/bin/%: programs/pkgutils/Cargo.toml programs/pkgutils/src/%/**.rs $(BUILD)/libstd.rlib
+	mkdir -p filesystem/bin
+	$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
+	strip $@
+	rm $@.d
+
+
 filesystem/bin/%: programs/userutils/Cargo.toml programs/userutils/src/bin/%.rs $(BUILD)/libstd.rlib
 	mkdir -p filesystem/bin
 	$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
@@ -374,6 +383,9 @@ orbutils: \
 	filesystem/bin/terminal \
 	filesystem/bin/viewer
 
+pkgutils: \
+	filesystem/bin/pkg
+
 userutils: \
 	filesystem/bin/getty \
 	filesystem/bin/id \
@@ -396,12 +408,14 @@ $(BUILD)/filesystem.bin: \
 		extrautils \
 		netutils \
 		orbutils \
+		pkgutils \
 		userutils \
 		schemes \
 		filesystem/bin/acid \
 		filesystem/bin/ion \
 		filesystem/bin/sh \
-		filesystem/bin/smith
+		filesystem/bin/smith \
+		filesystem/bin/tar
 	rm -rf $@ $(BUILD)/filesystem/
 	echo exit | cargo run --manifest-path schemes/redoxfs/Cargo.toml --bin redoxfs-utility $@ 64
 	mkdir -p $(BUILD)/filesystem/
diff --git a/filesystem/etc/init.rc b/filesystem/etc/init.rc
index 36e499e..09dde5e 100644
--- a/filesystem/etc/init.rc
+++ b/filesystem/etc/init.rc
@@ -2,10 +2,10 @@ initfs:bin/pcid /etc/pcid.toml
 vesad T T G
 ps2d
 ethernetd
-arpd
+#arpd
 ipd
 tcpd
 udpd
 getty display:1
 getty display:2
-orbital display:3
+#orbital display:3
diff --git a/programs/acid b/programs/acid
index f05b9d5..bbb5d70 160000
--- a/programs/acid
+++ b/programs/acid
@@ -1 +1 @@
-Subproject commit f05b9d57f344296e93131d680015b891f09603e4
+Subproject commit bbb5d70e865cc00412770121347cdbaff2b9fe2d
diff --git a/programs/ion b/programs/ion
index 100ed07..c38292b 160000
--- a/programs/ion
+++ b/programs/ion
@@ -1 +1 @@
-Subproject commit 100ed07adfc02143dfa6b4ba81f988cfd2c7a835
+Subproject commit c38292b355726cc0a4fade41fb55ae4e6eada882
diff --git a/programs/orbutils b/programs/orbutils
index fa9156d..86558e2 160000
--- a/programs/orbutils
+++ b/programs/orbutils
@@ -1 +1 @@
-Subproject commit fa9156dee23d6da5b20a76f596c9ed263c7bd408
+Subproject commit 86558e2b24d3d018a322f3b0775c7f2ca03896f6
diff --git a/programs/pkgutils b/programs/pkgutils
new file mode 160000
index 0000000..b477de8
--- /dev/null
+++ b/programs/pkgutils
@@ -0,0 +1 @@
+Subproject commit b477de831dbdd9f00c58e832bd253209604a1c91
diff --git a/programs/tar b/programs/tar
new file mode 160000
index 0000000..aa524fb
--- /dev/null
+++ b/programs/tar
@@ -0,0 +1 @@
+Subproject commit aa524fbbe1e663aeb6817d39f1dc8f4ecd67b3dc