From f03ec3d4f397dda4389ffa1fe07fac493f40a9f8 Mon Sep 17 00:00:00 2001 From: Matthew Hilton <2693534+matt2005@users.noreply.github.com> Date: Sun, 5 Jan 2025 23:01:16 +0000 Subject: [PATCH] Added fix for #698. (#699) Added armv7 qt and armhf qt installs --- .github/workflows/pifile.yml | 2 +- updater/base_buster_arm7.Pifile | 11 +++++++++++ updater/base_buster_armhf.Pifile | 15 +++++++++++++-- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pifile.yml b/.github/workflows/pifile.yml index 7cae7e72..990f3447 100644 --- 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 index 9805436d..37f5b8d4 100644 --- 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 index acf93310..eee33f84 100644 --- 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 -" \ No newline at end of file +" + +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 / +"