Added fix for #698. (#699)

Added armv7 qt and armhf qt installs
opencardev · Jan 5, 2025 · f03ec3d · f03ec3d
1 parent 4e5c87e
commit f03ec3d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/.github/workflows/pifile.yml b/.github/workflows/pifile.yml
@@ -62,7 +62,7 @@ jobs:
           - {
               name: "Debian Buster arm7",
               basefile: "updater/base_buster_arm7",
-              arch: "arm7",
+              arch: "arm7-pi2",
               osname: "buster",
               ostype: "Debian"
             }

diff --git a/updater/base_buster_arm7.Pifile b/updater/base_buster_arm7.Pifile
@@ -51,3 +51,14 @@ wget -O /usr/local/bin/crankshaft.md5 https://github.com/opencardev/prebuilts/ra
 chmod 644 /usr/local/bin/crankshaft.md5
 
 "
+
+RUN bash -c "
+cd /root
+rm -rf /usr/local/qt5
+wget https://github.com/opencardev/prebuilts/raw/master/qt5/Qt_5151_armv7l_OpenGLES2.tar.xz.part00
+wget https://github.com/opencardev/prebuilts/raw/master/qt5/Qt_5151_armv7l_OpenGLES2.tar.xz.part01
+wget https://github.com/opencardev/prebuilts/raw/master/qt5/Qt_5151_armv7l_OpenGLES2.tar.xz.part02
+wget https://github.com/opencardev/prebuilts/raw/master/qt5/Qt_5151_armv7l_OpenGLES2.tar.xz.part03
+cat Qt_5151_armv7l_OpenGLES2.tar.xz* > Qt5_OpenGLES2.tar.xz
+tar -xf Qt5_OpenGLES2.tar.xz -C /
+"
diff --git a/updater/base_buster_armhf.Pifile b/updater/base_buster_armhf.Pifile
@@ -1,5 +1,5 @@
 #FROM https://downloads.raspberrypi.org/raspios_lite_armhf/images/raspios_lite_armhf-2021-05-28/2021-05-07-raspios-buster-armhf-lite.zip
-FROM https://github.com/opencardev/crankshaft/releases/download/v.2022.09.12.1/2022-09-11-crankshaft-ng-66525ef-pi2.zip
+FROM https://github.com/opencardev/crankshaft/releases/download/v.2022.09.12.1/2022-09-11-crankshaft-ng-66525ef.zip
 PUMP 1000M
 
 # Update OS and sources
@@ -50,4 +50,15 @@ rm -f /usr/local/bin/crankshaft.md5
 wget -O /usr/local/bin/crankshaft.md5 https://github.com/opencardev/prebuilts/raw/master/csmt/crankshaft.md5
 chmod 644 /usr/local/bin/crankshaft.md5
 
-"
+"
+
+RUN bash -c "
+cd /root
+rm -rf /usr/local/qt5
+wget https://github.com/opencardev/prebuilts/raw/master/qt5/Qt_5151_OpenGLES2.tar.xz.part00
+wget https://github.com/opencardev/prebuilts/raw/master/qt5/Qt_5151_OpenGLES2.tar.xz.part01
+wget https://github.com/opencardev/prebuilts/raw/master/qt5/Qt_5151_OpenGLES2.tar.xz.part02
+wget https://github.com/opencardev/prebuilts/raw/master/qt5/Qt_5151_OpenGLES2.tar.xz.part03
+cat Qt_5151_OpenGLES2.tar.xz* > Qt5_OpenGLES2.tar.xz
+tar -xf Qt5_OpenGLES2.tar.xz -C /
+"