From 29a4c54468964962f3973c523acb3278fa6b303e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
Date: Tue, 6 Aug 2024 21:32:42 +0200
Subject: [PATCH] ci: use OpenWRT SDK v23.05.4
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Binary builds and SDKs for archs38 are not provided anymore.

The SDK now also requires STAGING_DIR_HOST to be set.

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
---
 .github/workflows/cibuild.yml        | 7 ++-----
 .github/workflows/openwrt-sdk-env.sh | 9 +++++----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml
index ca49d945c9..2aacc49d1e 100644
--- a/.github/workflows/cibuild.yml
+++ b/.github/workflows/cibuild.yml
@@ -208,9 +208,6 @@ jobs:
           - target: x86
             subtarget: generic
             abi: musl
-          - target: archs38
-            subtarget: generic
-            abi: glibc
     env:
       COMPILER: none
     steps:
@@ -220,8 +217,8 @@ jobs:
         run: sudo -E .github/workflows/cibuild-setup-ubuntu.sh
       - name: OpenWrt environment
         run: |
-          OPENWRT_RELEASE=22.03.5
-          OPENWRT_SDK=openwrt-sdk-$OPENWRT_RELEASE-${{ matrix.target }}-${{ matrix.subtarget }}_gcc-11.2.0_${{ matrix.abi }}.Linux-x86_64
+          OPENWRT_RELEASE=23.05.4
+          OPENWRT_SDK=openwrt-sdk-$OPENWRT_RELEASE-${{ matrix.target }}-${{ matrix.subtarget }}_gcc-12.3.0_${{ matrix.abi }}.Linux-x86_64
           echo "COMPILER=$COMPILER" >> $GITHUB_ENV
           echo "OPENWRT_RELEASE=$OPENWRT_RELEASE" >> $GITHUB_ENV
           echo "OPENWRT_SDK=$OPENWRT_SDK" >> $GITHUB_ENV
diff --git a/.github/workflows/openwrt-sdk-env.sh b/.github/workflows/openwrt-sdk-env.sh
index 91a198d2f8..1646fed93e 100755
--- a/.github/workflows/openwrt-sdk-env.sh
+++ b/.github/workflows/openwrt-sdk-env.sh
@@ -3,17 +3,18 @@
 sdk="$(realpath $1)"
 
 STAGING_DIR="$(echo "$sdk"/staging_dir/toolchain-*)"
+STAGING_DIR_HOST="$sdk/staging_dir/host/"
 
 . "$STAGING_DIR/info.mk"
 
-PATH="$sdk/staging_dir/host/bin:$PATH"
+PATH="$STAGING_DIR_HOST/bin:$PATH"
 LD_LIBRARY_PATH="$STAGING_DIR/lib"
 CC="$STAGING_DIR/bin/${TARGET_CROSS}gcc"
 DYNAMIC_LINKER="$(echo "$STAGING_DIR"/lib/ld-musl-*)"
-BISON_PKGDATADIR="$sdk/staging_dir/host/share/bison"
-M4="$sdk/staging_dir/host/bin/m4"
+BISON_PKGDATADIR="$STAGING_DIR_HOST/share/bison"
+M4="$STAGING_DIR_HOST/bin/m4"
 HOST_TRIPLET="$("$CC" -dumpmachine)"
 
 echo "Building for $HOST_TRIPLET from $sdk"
 
-export STAGING_DIR PATH LD_LIBRARY_PATH CC DYNAMIC_LINKER BISON_PKGDATADIR M4 HOST_TRIPLET
+export STAGING_DIR STAGING_DIR_HOST PATH LD_LIBRARY_PATH CC DYNAMIC_LINKER BISON_PKGDATADIR M4 HOST_TRIPLET
-- 
2.47.2