vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Segregate drivers and schemes in /sbin, UI apps in ui/bin

Browse source
This commit is contained in:
Jeremy Soller 2016-11-26 11:33:05 -07:00
parent 070e3d7b0a
commit c885d11337
7 changed files with 40 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -4,3 +4,4 @@ target
initfs/bin initfs/bin
filesystem/bin filesystem/bin
filesystem/ref filesystem/ref
filesystem/sbin

52
Makefile
View file

@ -60,7 +60,7 @@ clean:
cargo clean --manifest-path schemes/udpd/Cargo.toml cargo clean --manifest-path schemes/udpd/Cargo.toml
-$(FUMOUNT) build/filesystem/ -$(FUMOUNT) build/filesystem/
rm -rf initfs/bin rm -rf initfs/bin
rm -rf filesystem/bin rm -rf filesystem/bin filesystem/sbin filesystem/ui/bin
rm -rf build rm -rf build
doc: \ doc: \
@ -371,8 +371,8 @@ $(BUILD)/initfs.rs: \
echo ' files' >> $@ echo ' files' >> $@
echo '}' >> $@ echo '}' >> $@
filesystem/bin/%: drivers/%/Cargo.toml drivers/%/src/** $(BUILD)/libstd.rlib filesystem/sbin/%: drivers/%/Cargo.toml drivers/%/src/** $(BUILD)/libstd.rlib
mkdir -p filesystem/bin mkdir -p filesystem/sbin
$(CARGO) rustc --manifest-path $< $(CARGOFLAGS) -o $@ $(CARGO) rustc --manifest-path $< $(CARGOFLAGS) -o $@
strip $@ strip $@
rm $@.d rm $@.d
@ -410,8 +410,8 @@ filesystem/bin/%: programs/netutils/Cargo.toml programs/netutils/src/%/**.rs $(B
strip $@ strip $@
rm $@.d rm $@.d
filesystem/bin/%: programs/orbutils/Cargo.toml programs/orbutils/src/%/**.rs $(BUILD)/libstd.rlib filesystem/ui/bin/%: programs/orbutils/Cargo.toml programs/orbutils/src/%/**.rs $(BUILD)/libstd.rlib
mkdir -p filesystem/bin mkdir -p filesystem/ui/bin
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@ $(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
strip $@ strip $@
rm $@.d rm $@.d
@ -428,15 +428,16 @@ filesystem/bin/%: programs/userutils/Cargo.toml programs/userutils/src/bin/%.rs
strip $@ strip $@
rm $@.d rm $@.d
filesystem/bin/%: schemes/%/Cargo.toml schemes/%/src/** $(BUILD)/libstd.rlib filesystem/sbin/%: schemes/%/Cargo.toml schemes/%/src/** $(BUILD)/libstd.rlib
mkdir -p filesystem/bin mkdir -p filesystem/sbin
$(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@ $(CARGO) rustc --manifest-path $< --bin $* $(CARGOFLAGS) -o $@
strip $@ strip $@
rm $@.d rm $@.d
drivers: \ drivers: \
filesystem/bin/e1000d \ filesystem/sbin/pcid \
filesystem/bin/rtl8168d filesystem/sbin/e1000d \
filesystem/sbin/rtl8168d
binutils: \ binutils: \
filesystem/bin/hex \ filesystem/bin/hex \
@ -504,15 +505,15 @@ netutils: \
filesystem/bin/wget filesystem/bin/wget
orbutils: \ orbutils: \
filesystem/bin/browser \ filesystem/ui/bin/browser \
filesystem/bin/calculator \ filesystem/ui/bin/calculator \
filesystem/bin/character_map \ filesystem/ui/bin/character_map \
filesystem/bin/editor \ filesystem/ui/bin/editor \
filesystem/bin/file_manager \ filesystem/ui/bin/file_manager \
filesystem/bin/launcher \ filesystem/ui/bin/launcher \
filesystem/bin/orblogin \ filesystem/ui/bin/orblogin \
filesystem/bin/terminal \ filesystem/ui/bin/terminal \
filesystem/bin/viewer filesystem/ui/bin/viewer
pkgutils: \ pkgutils: \
filesystem/bin/pkg filesystem/bin/pkg
@ -526,14 +527,13 @@ userutils: \
filesystem/bin/sudo filesystem/bin/sudo
schemes: \ schemes: \
filesystem/bin/ethernetd \ filesystem/sbin/ethernetd \
filesystem/bin/example \ filesystem/sbin/ipd \
filesystem/bin/ipd \ filesystem/sbin/orbital \
filesystem/bin/orbital \ filesystem/sbin/ptyd \
filesystem/bin/ptyd \ filesystem/sbin/randd \
filesystem/bin/randd \ filesystem/sbin/tcpd \
filesystem/bin/tcpd \ filesystem/sbin/udpd
filesystem/bin/udpd
build/filesystem.bin: \ build/filesystem.bin: \
drivers \ drivers \

16
filesystem/etc/init.rc
View file

@ -1,13 +1,13 @@
randd /sbin/randd
ptyd /sbin/ptyd
initfs:bin/pcid /etc/pcid.toml /sbin/pcid /etc/pcid.toml
ethernetd /sbin/ethernetd
ipd /sbin/ipd
tcpd /sbin/tcpd
udpd /sbin/udpd
dhcpd -b dhcpd -b
httpd -b /ref httpd -b /ref
getty display:2 getty display:2
getty display:3 getty display:3
stdio debug: stdio debug:
orbital display:4 /sbin/orbital display:4 /ui/bin/orblogin /ui/bin/launcher

4
filesystem/etc/pcid.toml
View file

@ -3,11 +3,11 @@ name = "E1000 NIC"
class = 2 class = 2
vendor = 32902 vendor = 32902
device = 4110 device = 4110
command = ["e1000d", "$NAME", "$BAR0", "$IRQ"] command = ["/sbin/e1000d", "$NAME", "$BAR0", "$IRQ"]
[[drivers]] [[drivers]]
name = "RTL8168 NIC" name = "RTL8168 NIC"
class = 2 class = 2
vendor = 4332 vendor = 4332
device = 33128 device = 33128
command = ["rtl8168d", "$NAME", "$BAR2", "$IRQ"] command = ["/sbin/rtl8168d", "$NAME", "$BAR2", "$IRQ"]

2
filesystem/ui

@ -1 +1 @@
Subproject commit 0192262071d97ff8eb0c61824560797e7a5f3e5e Subproject commit 4a1f87b219b3db104f3e9ff21d974118357ff2e1

2
programs/orbutils

@ -1 +1 @@
Subproject commit f4b5343520ced192ea3c85327b51dfcc91cad701 Subproject commit 0459aa2df66d9f6f0f76fde70deda51fda6621c3

2
schemes/orbital

@ -1 +1 @@
Subproject commit ed3c1091f1a92c290b279840496929ff36096896 Subproject commit 231f5d2dfa2f6951f196fb38237968c1b4d83af3