From c885d1133728fb35ffefd311782fc33734789cb1 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Sat, 26 Nov 2016 11:33:05 -0700
Subject: [PATCH] Segregate drivers and schemes in /sbin, UI apps in ui/bin

---
 .gitignore               |  1 +
 Makefile                 | 52 ++++++++++++++++++++--------------------
 filesystem/etc/init.rc   | 16 ++++++-------
 filesystem/etc/pcid.toml |  4 ++--
 filesystem/ui            |  2 +-
 programs/orbutils        |  2 +-
 schemes/orbital          |  2 +-
 7 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/.gitignore b/.gitignore
index dddd16e..a8b6ee3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ target
 initfs/bin
 filesystem/bin
 filesystem/ref
+filesystem/sbin
diff --git a/Makefile b/Makefile
index 480a585..577786b 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ clean:
 	cargo clean --manifest-path schemes/udpd/Cargo.toml
 	-$(FUMOUNT) build/filesystem/
 	rm -rf initfs/bin
-	rm -rf filesystem/bin
+	rm -rf filesystem/bin filesystem/sbin filesystem/ui/bin
 	rm -rf build
 
 doc: \
@@ -371,8 +371,8 @@ $(BUILD)/initfs.rs: \
 	echo '    files' >> $@
 	echo '}' >> $@
 
-filesystem/bin/%: drivers/%/Cargo.toml drivers/%/src/** $(BUILD)/libstd.rlib
-	mkdir -p filesystem/bin
+filesystem/sbin/%: drivers/%/Cargo.toml drivers/%/src/** $(BUILD)/libstd.rlib
+	mkdir -p filesystem/sbin
 	$(CARGO) rustc --manifest-path $< $(CARGOFLAGS) -o $@
 	strip $@
 	rm $@.d
@@ -410,8 +410,8 @@ filesystem/bin/%: programs/netutils/Cargo.toml programs/netutils/src/%/**.rs $(B
 	strip $@
 	rm $@.d
 
-filesystem/bin/%: programs/orbutils/Cargo.toml programs/orbutils/src/%/**.rs $(BUILD)/libstd.rlib
-	mkdir -p filesystem/bin
+filesystem/ui/bin/%: programs/orbutils/Cargo.toml programs/orbutils/src/%/**.rs $(BUILD)/libstd.rlib
+	mkdir -p filesystem/ui/bin
 	$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
 	strip $@
 	rm $@.d
@@ -428,15 +428,16 @@ filesystem/bin/%: programs/userutils/Cargo.toml programs/userutils/src/bin/%.rs
 	strip $@
 	rm $@.d
 
-filesystem/bin/%: schemes/%/Cargo.toml schemes/%/src/** $(BUILD)/libstd.rlib
-	mkdir -p filesystem/bin
+filesystem/sbin/%: schemes/%/Cargo.toml schemes/%/src/** $(BUILD)/libstd.rlib
+	mkdir -p filesystem/sbin
 	$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
 	strip $@
 	rm $@.d
 
 drivers: \
-	filesystem/bin/e1000d \
-	filesystem/bin/rtl8168d
+	filesystem/sbin/pcid \
+	filesystem/sbin/e1000d \
+	filesystem/sbin/rtl8168d
 
 binutils: \
 	filesystem/bin/hex \
@@ -504,15 +505,15 @@ netutils: \
 	filesystem/bin/wget
 
 orbutils: \
-	filesystem/bin/browser \
-	filesystem/bin/calculator \
-	filesystem/bin/character_map \
-	filesystem/bin/editor \
-	filesystem/bin/file_manager \
-	filesystem/bin/launcher \
-	filesystem/bin/orblogin \
-	filesystem/bin/terminal \
-	filesystem/bin/viewer
+	filesystem/ui/bin/browser \
+	filesystem/ui/bin/calculator \
+	filesystem/ui/bin/character_map \
+	filesystem/ui/bin/editor \
+	filesystem/ui/bin/file_manager \
+	filesystem/ui/bin/launcher \
+	filesystem/ui/bin/orblogin \
+	filesystem/ui/bin/terminal \
+	filesystem/ui/bin/viewer
 
 pkgutils: \
 	filesystem/bin/pkg
@@ -526,14 +527,13 @@ userutils: \
 	filesystem/bin/sudo
 
 schemes: \
-	filesystem/bin/ethernetd \
-	filesystem/bin/example \
-	filesystem/bin/ipd \
-	filesystem/bin/orbital \
-	filesystem/bin/ptyd \
-	filesystem/bin/randd \
-	filesystem/bin/tcpd \
-	filesystem/bin/udpd
+	filesystem/sbin/ethernetd \
+	filesystem/sbin/ipd \
+	filesystem/sbin/orbital \
+	filesystem/sbin/ptyd \
+	filesystem/sbin/randd \
+	filesystem/sbin/tcpd \
+	filesystem/sbin/udpd
 
 build/filesystem.bin: \
 		drivers \
diff --git a/filesystem/etc/init.rc b/filesystem/etc/init.rc
index 26c5fcb..c5f3d0d 100644
--- a/filesystem/etc/init.rc
+++ b/filesystem/etc/init.rc
@@ -1,13 +1,13 @@
-randd
-ptyd
-initfs:bin/pcid /etc/pcid.toml
-ethernetd
-ipd
-tcpd
-udpd
+/sbin/randd
+/sbin/ptyd
+/sbin/pcid /etc/pcid.toml
+/sbin/ethernetd
+/sbin/ipd
+/sbin/tcpd
+/sbin/udpd
 dhcpd -b
 httpd -b /ref
 getty display:2
 getty display:3
 stdio debug:
-orbital display:4
+/sbin/orbital display:4 /ui/bin/orblogin /ui/bin/launcher
diff --git a/filesystem/etc/pcid.toml b/filesystem/etc/pcid.toml
index 11c4738..da177da 100644
--- a/filesystem/etc/pcid.toml
+++ b/filesystem/etc/pcid.toml
@@ -3,11 +3,11 @@ name = "E1000 NIC"
 class = 2
 vendor = 32902
 device = 4110
-command = ["e1000d", "$NAME", "$BAR0", "$IRQ"]
+command = ["/sbin/e1000d", "$NAME", "$BAR0", "$IRQ"]
 
 [[drivers]]
 name = "RTL8168 NIC"
 class = 2
 vendor = 4332
 device = 33128
-command = ["rtl8168d", "$NAME", "$BAR2", "$IRQ"]
+command = ["/sbin/rtl8168d", "$NAME", "$BAR2", "$IRQ"]
diff --git a/filesystem/ui b/filesystem/ui
index 0192262..4a1f87b 160000
--- a/filesystem/ui
+++ b/filesystem/ui
@@ -1 +1 @@
-Subproject commit 0192262071d97ff8eb0c61824560797e7a5f3e5e
+Subproject commit 4a1f87b219b3db104f3e9ff21d974118357ff2e1
diff --git a/programs/orbutils b/programs/orbutils
index f4b5343..0459aa2 160000
--- a/programs/orbutils
+++ b/programs/orbutils
@@ -1 +1 @@
-Subproject commit f4b5343520ced192ea3c85327b51dfcc91cad701
+Subproject commit 0459aa2df66d9f6f0f76fde70deda51fda6621c3
diff --git a/schemes/orbital b/schemes/orbital
index ed3c109..231f5d2 160000
--- a/schemes/orbital
+++ b/schemes/orbital
@@ -1 +1 @@
-Subproject commit ed3c1091f1a92c290b279840496929ff36096896
+Subproject commit 231f5d2dfa2f6951f196fb38237968c1b4d83af3