Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop patching bootstrap #20

Merged
merged 3 commits into from
Jun 9, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,10 @@ CMD run_vm.sh -nographic

FROM qemu-base AS qemu-toltec

# TODO: remove custom wget patch when toltec bootstrap is updated.
RUN run_vm.sh -serial null -daemonize && \
wait_ssh.sh && \
ssh root@localhost 'while ! timedatectl status | grep "synchronized: yes"; do sleep 1; done' && \
ssh root@localhost 'wget http://toltec-dev.org/bootstrap && sed -i "s|wget_remote=http://toltec-dev.org/thirdparty/bin/wget-v1.21.1|wget_remote=http://toltec-dev.org/thirdparty/bin/wget-v1.21.1-1|" bootstrap && sed -i "s|8798fcdabbe560722a02f95b30385926e4452e2c98c15c2c217583eaa0db30fc|c258140f059d16d24503c62c1fdf747ca843fe4ba8fcd464a6e6bda8c3bbb6b5|" bootstrap && bash bootstrap' && \
ssh root@localhost 'wget http://toltec-dev.org/bootstrap && bash bootstrap --force' && \
save_vm.sh

# Step 4: Build rm2fb-client and forwarder
Expand Down