From 100e2796cdc31bf15536fa4fb7e1c18378749418 Mon Sep 17 00:00:00 2001 From: Timothy Werquin Date: Thu, 21 Dec 2023 20:17:46 +0100 Subject: [PATCH 1/4] Add 3.8.3 and 3.9.3 versions --- .github/workflows/docker-image.yml | 2 +- updates.json | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 6671620..47b60ec 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -18,7 +18,7 @@ jobs: packages: write strategy: matrix: - fw_version: ['2.15.1', '3.3.2', '3.5.2', '3.8.2'] + fw_version: ['2.15.1', '3.3.2', '3.5.2', '3.8.3', '3.9.3'] steps: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 diff --git a/updates.json b/updates.json index c666ac0..cec51d6 100644 --- a/updates.json +++ b/updates.json @@ -1,4 +1,6 @@ { + "3.9.3.1986": "T1fuxwo40r", + "3.8.3.1976": "M795riZ0Z8", "3.8.2.1965": "D1pFxylu6p", "3.7.0.1930": "XSMSQgBATy", "3.6.1.1894": "T2dkdktE1H", From 6ca67cee1d66c68171d31201e8819f1413bacd26 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 5 Feb 2024 14:12:46 -0700 Subject: [PATCH 2/4] Fix wget replacement The current solution does not work with the built in wget --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6e281b0..871ad16 100644 --- a/Dockerfile +++ b/Dockerfile @@ -104,7 +104,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=https://github.com/Azathothas/Static-Binaries/raw/main/wget/wget_busybox_armv7l_abihf_musl_Linux|" bootstrap && sed -i "s|8798fcdabbe560722a02f95b30385926e4452e2c98c15c2c217583eaa0db30fc|ec215780dc74381fd5464d11b1e8efe9736f332acb237706c90720b4baa641ca|" bootstrap && bash bootstrap' && \ + 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' && \ save_vm.sh # Step 4: Build rm2fb-client and forwarder From e6cf5a7b10accdb48b9479004e5267531614c66d Mon Sep 17 00:00:00 2001 From: Timothy Werquin Date: Mon, 12 Feb 2024 21:53:25 +0100 Subject: [PATCH 3/4] Add xochitl 3.9.4 to updates --- updates.json | 1 + 1 file changed, 1 insertion(+) diff --git a/updates.json b/updates.json index cec51d6..73312e6 100644 --- a/updates.json +++ b/updates.json @@ -1,4 +1,5 @@ { + "3.9.4.2018": "dg5knKZECj", "3.9.3.1986": "T1fuxwo40r", "3.8.3.1976": "M795riZ0Z8", "3.8.2.1965": "D1pFxylu6p", From 51efafc36d70a9d45e9cddd10bcb108270e4d596 Mon Sep 17 00:00:00 2001 From: Timothy Werquin Date: Wed, 17 Apr 2024 20:09:17 +0200 Subject: [PATCH 4/4] Add 3.10.2 --- updates.json | 1 + 1 file changed, 1 insertion(+) diff --git a/updates.json b/updates.json index 73312e6..a16a199 100644 --- a/updates.json +++ b/updates.json @@ -1,4 +1,5 @@ { + "3.10.2.2063": "zKnOgdh8c5", "3.9.4.2018": "dg5knKZECj", "3.9.3.1986": "T1fuxwo40r", "3.8.3.1976": "M795riZ0Z8",