From e9659bf5ea10f747e2f26f3b579d017376d95d1a Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 8 Jun 2024 22:48:42 -0600 Subject: [PATCH 1/3] Stop patching bootstrap This change has made its way to toltec stable. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6ec07b2..ea7c7c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -106,7 +106,7 @@ FROM qemu-base AS qemu-toltec 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' && \ save_vm.sh # Step 4: Build rm2fb-client and forwarder From 94feb3004db7ea4409302c95183666f740a2e737 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 8 Jun 2024 23:03:53 -0600 Subject: [PATCH 2/3] Remove extra whitespace --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ea7c7c5..788d847 100644 --- a/Dockerfile +++ b/Dockerfile @@ -106,7 +106,7 @@ FROM qemu-base AS qemu-toltec 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 && bash bootstrap' && \ + ssh root@localhost 'wget http://toltec-dev.org/bootstrap && bash bootstrap' && \ save_vm.sh # Step 4: Build rm2fb-client and forwarder From a11100633167178d2d93b986a449ddc480a319e9 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 8 Jun 2024 23:33:57 -0600 Subject: [PATCH 3/3] Force install --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 788d847..3b76b7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 && bash bootstrap' && \ + ssh root@localhost 'wget http://toltec-dev.org/bootstrap && bash bootstrap --force' && \ save_vm.sh # Step 4: Build rm2fb-client and forwarder