get-openwrt.sh

klzgrad · Oct 19, 2024 · e2c45ef · e2c45ef
1 parent f07c5f1
commit e2c45ef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ defaults:
     shell: bash
     working-directory: src
 env:
-  CACHE_EPOCH: 2
+  CACHE_EPOCH: 3
   CCACHE_MAXSIZE: 200M
   CCACHE_MAXFILES: 0
   SCCACHE_CACHE_SIZE: 200M
@@ -492,7 +492,7 @@ jobs:
             openwrt_gcc_ver: '12.3.0'
     env:
       EXTRA_FLAGS: target_cpu="${{ matrix.target_cpu }}" target_os="openwrt" ${{ matrix.extra }}
-      OPENWRT_FLAGS: arch=${{ matrix.arch }} release=${{ matrix.openwrt_release || '21.02.0' }} gcc_ver=${{ matrix.openwrt_gcc_ver || '8.4.0' }} ${{ matrix.openwrt }}
+      OPENWRT_FLAGS: arch=${{ matrix.arch }} release=${{ matrix.openwrt_release || '18.06.0' }} gcc_ver=${{ matrix.openwrt_gcc_ver || '7.3.0' }} ${{ matrix.openwrt }}
       BUNDLE: naiveproxy-${{ github.event.release.tag_name }}-${{ github.job }}-${{ matrix.arch }}
     steps:
       - uses: actions/checkout@v4

diff --git a/src/get-openwrt.sh b/src/get-openwrt.sh
@@ -22,10 +22,13 @@ else
   path_suffix=sdk
 fi
 
-if [ "$subtarget" ]; then
+if [ ! "$subtarget" ]; then
+  subtarget=generic
+fi
+
+if [ "$subtarget" != generic -o "$major" -ge 22 ]; then
   SDK_PATH=openwrt-$path_suffix-$release-$target-${subtarget}_gcc-${gcc_ver}_${abi}.Linux-x86_64
 else
-  subtarget='generic'
   SDK_PATH=openwrt-$path_suffix-$release-${target}_gcc-${gcc_ver}_${abi}.Linux-x86_64
 fi
 SDK_URL=https://downloads.openwrt.org/releases/$release/targets/$target/$subtarget/$SDK_PATH.tar.xz