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

Add httpd to makefile and init.rc

Browse source
This commit is contained in:
Jeremy Soller 2016-10-23 19:02:48 -06:00
parent c805f53ade
commit 80d326f1d9
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -38,9 +38,11 @@ clean:
cargo clean --manifest-path programs/extrautils/Cargo.toml cargo clean --manifest-path programs/extrautils/Cargo.toml
cargo clean --manifest-path programs/netutils/Cargo.toml cargo clean --manifest-path programs/netutils/Cargo.toml
cargo clean --manifest-path programs/orbutils/Cargo.toml cargo clean --manifest-path programs/orbutils/Cargo.toml
cargo clean --manifest-path programs/pkgutils/Cargo.toml
cargo clean --manifest-path programs/userutils/Cargo.toml cargo clean --manifest-path programs/userutils/Cargo.toml
cargo clean --manifest-path programs/smith/Cargo.toml cargo clean --manifest-path programs/smith/Cargo.toml
cargo clean --manifest-path programs/tar/Cargo.toml cargo clean --manifest-path programs/tar/Cargo.toml
cargo clean --manifest-path schemes/arpd/Cargo.toml
cargo clean --manifest-path schemes/ethernetd/Cargo.toml cargo clean --manifest-path schemes/ethernetd/Cargo.toml
cargo clean --manifest-path schemes/example/Cargo.toml cargo clean --manifest-path schemes/example/Cargo.toml
cargo clean --manifest-path schemes/ipd/Cargo.toml cargo clean --manifest-path schemes/ipd/Cargo.toml
@ -86,9 +88,11 @@ update:
cargo update --manifest-path programs/extrautils/Cargo.toml cargo update --manifest-path programs/extrautils/Cargo.toml
cargo update --manifest-path programs/netutils/Cargo.toml cargo update --manifest-path programs/netutils/Cargo.toml
cargo update --manifest-path programs/orbutils/Cargo.toml cargo update --manifest-path programs/orbutils/Cargo.toml
cargo update --manifest-path programs/pkgutils/Cargo.toml
cargo update --manifest-path programs/userutils/Cargo.toml cargo update --manifest-path programs/userutils/Cargo.toml
cargo update --manifest-path programs/smith/Cargo.toml cargo update --manifest-path programs/smith/Cargo.toml
cargo update --manifest-path programs/tar/Cargo.toml cargo update --manifest-path programs/tar/Cargo.toml
cargo update --manifest-path schemes/arpd/Cargo.toml
cargo update --manifest-path schemes/ethernetd/Cargo.toml cargo update --manifest-path schemes/ethernetd/Cargo.toml
cargo update --manifest-path schemes/example/Cargo.toml cargo update --manifest-path schemes/example/Cargo.toml
cargo update --manifest-path schemes/ipd/Cargo.toml cargo update --manifest-path schemes/ipd/Cargo.toml
@ -121,6 +125,9 @@ else
QEMUFLAGS+=-net none QEMUFLAGS+=-net none
else else
QEMUFLAGS+=-net nic,model=e1000 -net user -net dump,file=$(KBUILD)/network.pcap QEMUFLAGS+=-net nic,model=e1000 -net user -net dump,file=$(KBUILD)/network.pcap
ifeq ($(net),redir)
QEMUFLAGS+=-redir tcp:8080::8080
endif
endif endif
ifeq ($(storage),usb) ifeq ($(storage),usb)
QEMUFLAGS+=-device usb-ehci,id=flash_bus -drive id=flash_drive,file=$(KBUILD)/harddrive.bin,format=raw,if=none -device usb-storage,drive=flash_drive,bus=flash_bus.0 QEMUFLAGS+=-device usb-ehci,id=flash_bus -drive id=flash_drive,file=$(KBUILD)/harddrive.bin,format=raw,if=none -device usb-storage,drive=flash_drive,bus=flash_bus.0
@ -372,6 +379,7 @@ extrautils: \
netutils: \ netutils: \
filesystem/bin/dhcpd \ filesystem/bin/dhcpd \
filesystem/bin/dns \ filesystem/bin/dns \
filesystem/bin/httpd \
filesystem/bin/irc \ filesystem/bin/irc \
filesystem/bin/nc \ filesystem/bin/nc \
filesystem/bin/wget filesystem/bin/wget

3
filesystem/etc/init.rc
View file

@ -4,7 +4,8 @@ arpd
ipd ipd
tcpd tcpd
udpd udpd
dhcpd -b dhcpd
httpd
getty display:2 getty display:2
getty display:3 getty display:3
#orbital display:4 #orbital display:4