Skip to content

Commit ed0a83c

Browse files
dev: update v86, switch twisp to epoxy-server with twisp feature
1 parent c7b08d1 commit ed0a83c

File tree

6 files changed

+26
-16
lines changed

6 files changed

+26
-16
lines changed

src/emulator/image/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ COPY rootfs/ /
2222
COPY basic-boot /etc/init.d/
2323
RUN chmod +x /etc/init.d/basic-boot
2424

25-
COPY assets/twisp /bin/twisp
26-
RUN chmod u+x /bin/twisp
25+
COPY assets/epoxy-server /bin/epoxy-server
26+
RUN chmod u+x /bin/epoxy-server
2727
RUN rc-update add twisp-service default
2828

2929
RUN rc-update add debug-service default
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[server]
2+
bind = "/dev/hvc0"
3+
socket = "file"
4+
transport = "lengthdelimitedle"
5+
file_raw_mode = true # maybe?
6+
7+
[stream]
8+
allow_twisp = true
9+
10+
[wisp]
11+
wisp_v2 = true
12+
buffer_size = 4294967295

src/emulator/image/rootfs/etc/init.d/twisp-service

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
#!/sbin/openrc-run
22

3-
description="twisp daemon"
4-
command="/bin/twisp"
5-
command_args="--pty /dev/hvc0"
6-
pidfile="/var/run/twisp.pid"
3+
description="Epoxy Daemon"
4+
command="/bin/epoxy-server"
5+
command_args="/etc/epoxyconf.toml"
76
command_background="yes"
7+
pidfile="/var/run/twisp.pid"
88
start_stop_daemon_args="--background --make-pidfile"
9+
output_log="/dev/ttyS0"
10+
error_log="/dev/ttyS0"
911

1012
depend() {
1113
need localmount

submodules/v86

Submodule v86 updated 58 files

tools/build_v86.sh

+4-8
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,15 @@ cd -
2020

2121
echo -e "\x1B[36;1m<<< Building Twisp >>>\x1B[0m"
2222

23-
cd submodules/twisp
23+
pwd
24+
cd submodules/epoxy-tls/server
2425

25-
RUSTFLAGS="-C target-feature=+crt-static" cargo build \
26-
--release \
27-
--target i686-unknown-linux-gnu \
28-
`# TODO: what are default features?` \
29-
--no-default-features
26+
RUSTFLAGS="-C target-feature=+crt-static" cargo +nightly b -F twisp -r --target i686-unknown-linux-gnu;
3027

3128
echo -e "\x1B[36;1m<<< Preparing to Build Imag >>>\x1B[0m"
3229

3330
cd -
34-
35-
cp submodules/twisp/target/i686-unknown-linux-gnu/release/twisp \
31+
cp submodules/epoxy-tls/target/i686-unknown-linux-gnu/release/epoxy-server \
3632
src/emulator/image/assets/
3733

3834
echo -e "\x1B[36;1m<<< Building Image >>>\x1B[0m"

0 commit comments

Comments
 (0)