mirror of
https://github.com/HeyPuter/puter.git
synced 2026-05-03 16:10:31 +00:00
dev: update v86, switch twisp to epoxy-server with twisp feature
This commit is contained in:
committed by
Eric Dubé
parent
c7b08d1b5e
commit
ed0a83ca9d
@@ -22,8 +22,8 @@ COPY rootfs/ /
|
||||
COPY basic-boot /etc/init.d/
|
||||
RUN chmod +x /etc/init.d/basic-boot
|
||||
|
||||
COPY assets/twisp /bin/twisp
|
||||
RUN chmod u+x /bin/twisp
|
||||
COPY assets/epoxy-server /bin/epoxy-server
|
||||
RUN chmod u+x /bin/epoxy-server
|
||||
RUN rc-update add twisp-service default
|
||||
|
||||
RUN rc-update add debug-service default
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
[server]
|
||||
bind = "/dev/hvc0"
|
||||
socket = "file"
|
||||
transport = "lengthdelimitedle"
|
||||
file_raw_mode = true # maybe?
|
||||
|
||||
[stream]
|
||||
allow_twisp = true
|
||||
|
||||
[wisp]
|
||||
wisp_v2 = true
|
||||
buffer_size = 4294967295
|
||||
@@ -1,11 +1,13 @@
|
||||
#!/sbin/openrc-run
|
||||
|
||||
description="twisp daemon"
|
||||
command="/bin/twisp"
|
||||
command_args="--pty /dev/hvc0"
|
||||
pidfile="/var/run/twisp.pid"
|
||||
description="Epoxy Daemon"
|
||||
command="/bin/epoxy-server"
|
||||
command_args="/etc/epoxyconf.toml"
|
||||
command_background="yes"
|
||||
pidfile="/var/run/twisp.pid"
|
||||
start_stop_daemon_args="--background --make-pidfile"
|
||||
output_log="/dev/ttyS0"
|
||||
error_log="/dev/ttyS0"
|
||||
|
||||
depend() {
|
||||
need localmount
|
||||
|
||||
+1
-1
Submodule submodules/epoxy-tls updated: 7fdacb2623...d6f1a8da43
+1
-1
Submodule submodules/v86 updated: f3339aa78e...1afc297f8b
+4
-8
@@ -20,19 +20,15 @@ cd -
|
||||
|
||||
echo -e "\x1B[36;1m<<< Building Twisp >>>\x1B[0m"
|
||||
|
||||
cd submodules/twisp
|
||||
pwd
|
||||
cd submodules/epoxy-tls/server
|
||||
|
||||
RUSTFLAGS="-C target-feature=+crt-static" cargo build \
|
||||
--release \
|
||||
--target i686-unknown-linux-gnu \
|
||||
`# TODO: what are default features?` \
|
||||
--no-default-features
|
||||
RUSTFLAGS="-C target-feature=+crt-static" cargo +nightly b -F twisp -r --target i686-unknown-linux-gnu;
|
||||
|
||||
echo -e "\x1B[36;1m<<< Preparing to Build Imag >>>\x1B[0m"
|
||||
|
||||
cd -
|
||||
|
||||
cp submodules/twisp/target/i686-unknown-linux-gnu/release/twisp \
|
||||
cp submodules/epoxy-tls/target/i686-unknown-linux-gnu/release/epoxy-server \
|
||||
src/emulator/image/assets/
|
||||
|
||||
echo -e "\x1B[36;1m<<< Building Image >>>\x1B[0m"
|
||||
|
||||
Reference in New Issue
Block a user