mirrors/puter
1
0
Fork 0
mirror of https://github.com/HeyPuter/puter synced 2024-11-14 14:03:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

dev: update v86, switch twisp to epoxy-server with twisp feature

Browse Source
This commit is contained in:
ProgrammerIn-wonderland 2024-10-07 20:07:10 -04:00 committed by Eric Dubé
parent c7b08d1b5e
commit ed0a83ca9d
6 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emulator/image/Dockerfile
View File

@ -22,8 +22,8 @@ COPY rootfs/ /
COPY basic-boot /etc/init.d/ COPY basic-boot /etc/init.d/
RUN chmod +x /etc/init.d/basic-boot RUN chmod +x /etc/init.d/basic-boot
COPY assets/twisp /bin/twisp COPY assets/epoxy-server /bin/epoxy-server
RUN chmod u+x /bin/twisp RUN chmod u+x /bin/epoxy-server
RUN rc-update add twisp-service default RUN rc-update add twisp-service default
RUN rc-update add debug-service default RUN rc-update add debug-service default

12
src/emulator/image/rootfs/etc/epoxyconf.toml Normal file
View File

@ -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

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

@ -1,11 +1,13 @@
#!/sbin/openrc-run #!/sbin/openrc-run
description="twisp daemon" description="Epoxy Daemon"
command="/bin/twisp" command="/bin/epoxy-server"
command_args="--pty /dev/hvc0" command_args="/etc/epoxyconf.toml"
pidfile="/var/run/twisp.pid"
command_background="yes" command_background="yes"
pidfile="/var/run/twisp.pid"
start_stop_daemon_args="--background --make-pidfile" start_stop_daemon_args="--background --make-pidfile"
output_log="/dev/ttyS0"
error_log="/dev/ttyS0"
depend() { depend() {
need localmount need localmount

2
submodules/epoxy-tls

@ -1 +1 @@
Subproject commit 7fdacb26237a0a69faacd1c08d746584fbd98f94 Subproject commit d6f1a8da43c11410595a7710613786d4fc37fa38

2
submodules/v86

@ -1 +1 @@
Subproject commit f3339aa78eeb9221d24ff86a2ea74b9ee1d2ee90 Subproject commit 1afc297f8b61704716c6eb9bfb281d57036bd588

12
tools/build_v86.sh
View File

@ -20,19 +20,15 @@ cd -
echo -e "\x1B[36;1m<<< Building Twisp >>>\x1B[0m" 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 \ RUSTFLAGS="-C target-feature=+crt-static" cargo +nightly b -F twisp -r --target i686-unknown-linux-gnu;
--release \
--target i686-unknown-linux-gnu \
`# TODO: what are default features?` \
--no-default-features
echo -e "\x1B[36;1m<<< Preparing to Build Imag >>>\x1B[0m" echo -e "\x1B[36;1m<<< Preparing to Build Imag >>>\x1B[0m"
cd - cd -
cp submodules/epoxy-tls/target/i686-unknown-linux-gnu/release/epoxy-server \
cp submodules/twisp/target/i686-unknown-linux-gnu/release/twisp \
src/emulator/image/assets/ src/emulator/image/assets/
echo -e "\x1B[36;1m<<< Building Image >>>\x1B[0m" echo -e "\x1B[36;1m<<< Building Image >>>\x1B[0m"