From 7f09f5c477d5834b2dbef96d341852ee563360a5 Mon Sep 17 00:00:00 2001
From: kub <derkub@gmail.com>
Date: Tue, 14 Nov 2023 23:34:50 +0100
Subject: [PATCH] build, switch to static miyoo toolchain

---
 .github/workflows/ci.yml |  5 ++---
 tools/release.sh         | 11 +++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 58a35a8f..27f9edc8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -161,15 +161,14 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       packages: read
-    container: miyoocfw/toolchain
+    container: ghcr.io/irixxxx/toolchain-miyoo
     steps:
     - uses: actions/checkout@v3
       with:
         submodules: true
     - name: build
       run: |
-        export CROSS_COMPILE=arm-buildroot-linux-musleabi-
-        git config --global --add safe.directory /home/picodrive
+        git config --global --add safe.directory $PWD
         ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
         ./configure --platform=miyoo
         make -j2
diff --git a/tools/release.sh b/tools/release.sh
index b4e04302..9c9cbcd2 100755
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -12,7 +12,7 @@
 #	dingux:		ghcr.io/irixxxx/toolchain-dingux
 #	retrofw:	ghcr.io/irixxxx/toolchain-retrofw
 #	gcw0, rg350:	ghcr.io/irixxxx/toolchain-opendingux
-#	miyoo:		miyoocfw/toolchain
+#	miyoo:		ghcr.io/irixxxx/toolchain-miyoo
 #	psp:		ghcr.io/pspdev/pspdev
 #	odbeta-gcw0:	ghcr.io/irixxxx/toolchain-odbeta-gcw0
 #	odbeta-lepus:	ghcr.io/irixxxx/toolchain-odbeta-lepus
@@ -23,7 +23,7 @@ rel=$1
 mkdir -p release-$rel
 
 shift; plat=" $* "
-[ -z "$(echo $plat|tr -d ' ')" ] && plat=" gph dingux retrofw gcw0 rg350 miyoo psp "
+[ -z "$(echo $plat|tr -d ' ')" ] && plat=" gph dingux retrofw gcw0 rg350 miyoo psp pandora odbeta-gcw0 odbeta-lepus "
 
 
 [ -z "${plat##* gph *}" ] && {
@@ -80,12 +80,11 @@ mv PicoDrive.opk release-$rel/PicoDrive-opendingux_$rel.opk
 
 [ -z "${plat##* miyoo *}" ] && {
 # miyoo: BittBoy >=v1, PocketGo, Powkiddy [QV]90/Q20 (Allwinner F1C100s, ARM926)
-docker pull miyoocfw/toolchain
-echo "	export CROSS_COMPILE=arm-buildroot-linux-musleabi- &&\
-	git config --global --add safe.directory /home/picodrive &&\
+docker pull ghcr.io/irixxxx/toolchain-miyoo
+echo "	git config --global --add safe.directory /home/picodrive &&\
 	./configure --platform=miyoo &&\
 	make clean && make -j2 all "\
-  | docker run -i -v$PWD:/home/picodrive -w/home/picodrive --rm miyoocfw/toolchain sh &&
+  | docker run -i -v$PWD:/home/picodrive -w/home/picodrive --rm ghcr.io/irixxxx/toolchain-miyoo sh &&
 mv PicoDrive.zip release-$rel/PicoDrive-miyoo_$rel.zip
 }
 
-- 
2.39.5