From c981e15e2d48e244a3de587e8897a435ef84a898 Mon Sep 17 00:00:00 2001 From: klzgrad Date: Sun, 24 Oct 2021 21:14:43 +0800 Subject: [PATCH] Update OpenWrt builds for 21.02.0 Removed useless parameter arm_version=0 in aarch64 builds. Re-added arm_arm1176jzf-s_vfp, arm_arm926ej-s, arm_mpcore, arm_xscale due to previously missing arm_use_thumb=false in build. Re-added arm_cortex-a5_vfpv4, missing in 19.07.8 but back in 21.02.0. Added arm_cortex-a7 (mediatek/mt7629), new in 21.02.0. Removed arm_cortex-a8_neon (samsung/s5pv210), removed in 21.02.0. --- .github/workflows/build.yml | 52 +++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 004f6d853d..32f22c38c2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -354,18 +354,38 @@ jobs: - arch: aarch64_cortex-a53 openwrt: 'target=sunxi subtarget=cortexa53' target_cpu: arm64 - extra: 'arm_version=0 arm_cpu="cortex-a53"' + extra: 'arm_cpu="cortex-a53"' - arch: aarch64_cortex-a53-static openwrt: 'target=sunxi subtarget=cortexa53' target_cpu: arm64 - extra: 'arm_version=0 arm_cpu="cortex-a53" build_static=true' + extra: 'arm_cpu="cortex-a53" build_static=true' - arch: aarch64_cortex-a72 openwrt: 'target=mvebu subtarget=cortexa72' target_cpu: arm64 - extra: 'arm_version=0 arm_cpu="cortex-a72"' + extra: 'arm_cpu="cortex-a72"' - arch: aarch64_generic - openwrt: 'target=armvirt subtarget=64' + openwrt: 'target=rockchip subtarget=armv8' target_cpu: arm64 + - arch: arm_arm1176jzf-s_vfp + openwrt: 'target=bcm27xx subtarget=bcm2708' + target_cpu: arm + extra: 'arm_version=0 arm_cpu="arm1176jzf-s" arm_fpu="vfp" arm_float_abi="hard" arm_use_neon=false arm_use_thumb=false' + - arch: arm_arm926ej-s + openwrt: 'target=mxs' + target_cpu: arm + extra: 'arm_version=0 arm_cpu="arm926ej-s" arm_float_abi="soft" arm_use_neon=false arm_use_thumb=false' + - arch: arm_cortex-a15_neon-vfpv4 + openwrt: 'target=armvirt subtarget=32' + target_cpu: arm + extra: 'arm_version=0 arm_cpu="cortex-a15" arm_fpu="neon-vfpv4" arm_float_abi="hard" arm_use_neon=true' + - arch: arm_cortex-a5_vfpv4 + openwrt: 'target=at91 subtarget=sama5' + target_cpu: arm + extra: 'arm_version=0 arm_cpu="cortex-a5" arm_fpu="vfpv4" arm_float_abi="hard" arm_use_neon=false' + - arch: arm_cortex-a7 + openwrt: 'target=mediatek subtarget=mt7629' + target_cpu: arm + extra: 'arm_version=0 arm_cpu="cortex-a7" arm_float_abi="soft" arm_use_neon=false' - arch: arm_cortex-a7_neon-vfpv4 openwrt: 'target=sunxi subtarget=cortexa7' target_cpu: arm @@ -374,20 +394,16 @@ jobs: openwrt: 'target=sunxi subtarget=cortexa7' target_cpu: arm extra: 'arm_version=0 arm_cpu="cortex-a7" arm_fpu="neon-vfpv4" arm_float_abi="hard" arm_use_neon=true build_static=true' - - arch: arm_cortex-a8_neon - openwrt: 'target=samsung subtarget=s5pv210' - target_cpu: arm - extra: 'arm_version=0 arm_cpu="cortex-a8" arm_fpu="neon" arm_float_abi="hard" arm_use_neon=true' - arch: arm_cortex-a8_vfpv3 openwrt: 'target=sunxi subtarget=cortexa8' target_cpu: arm extra: 'arm_version=0 arm_cpu="cortex-a8" arm_fpu="vfpv3" arm_float_abi="hard" arm_use_neon=false' - arch: arm_cortex-a9 - openwrt: 'target=bcm53xx' + openwrt: 'target=bcm53xx subtarget=generic' target_cpu: arm extra: 'arm_version=0 arm_cpu="cortex-a9" arm_float_abi="soft" arm_use_neon=false' - arch: arm_cortex-a9-static - openwrt: 'target=bcm53xx' + openwrt: 'target=bcm53xx subtarget=generic' target_cpu: arm extra: 'arm_version=0 arm_cpu="cortex-a9" arm_float_abi="soft" arm_use_neon=false build_static=true' - arch: arm_cortex-a9_neon @@ -398,10 +414,14 @@ jobs: openwrt: 'target=tegra' target_cpu: arm extra: 'arm_version=0 arm_cpu="cortex-a9" arm_fpu="vfpv3-d16" arm_float_abi="hard" arm_use_neon=false' - - arch: arm_cortex-a15_neon-vfpv4 - openwrt: 'target=armvirt subtarget=32' + - arch: arm_mpcore + openwrt: 'target=oxnas subtarget=ox820' target_cpu: arm - extra: 'arm_version=0 arm_cpu="cortex-a15" arm_fpu="neon-vfpv4" arm_float_abi="hard" arm_use_neon=true' + extra: 'arm_version=0 arm_cpu="mpcore" arm_float_abi="soft" arm_use_neon=false arm_use_thumb=false' + - arch: arm_xscale + openwrt: 'target=kirkwood' + target_cpu: arm + extra: 'arm_version=0 arm_cpu="xscale" arm_float_abi="soft" arm_use_neon=false arm_use_thumb=false' - arch: mipsel_24kc openwrt: 'target=ramips subtarget=rt305x' target_cpu: mipsel @@ -411,12 +431,12 @@ jobs: target_cpu: mipsel extra: 'mips_arch_variant="r2" mips_float_abi="soft" mips_tune="74kc" use_lld=false use_gold=false use_thin_lto=false chrome_pgo_phase=0' - arch: mipsel_mips32 - openwrt: 'target=rb532' + openwrt: 'target=bcm47xx subtarget=generic' target_cpu: mipsel extra: 'mips_arch_variant="r1" mips_float_abi="soft" use_lld=false use_gold=false use_thin_lto=false chrome_pgo_phase=0' env: EXTRA_FLAGS: target_cpu="${{ matrix.target_cpu }}" target_os="openwrt" use_allocator="none" use_allocator_shim=false ${{ matrix.extra }} - OPENWRT_FLAGS: arch=${{ matrix.arch }} release=19.07.8 gcc_ver=7.5.0 ${{ matrix.openwrt }} + OPENWRT_FLAGS: arch=${{ matrix.arch }} release=21.02.0 gcc_ver=8.4.0 ${{ matrix.openwrt }} BUNDLE: naiveproxy-${{ github.event.release.tag_name }}-${{ github.job }}-${{ matrix.arch }} steps: - uses: actions/checkout@v2 @@ -436,7 +456,7 @@ jobs: uses: actions/cache@v2 with: path: src/out/sysroot-build/openwrt - key: sysroot-openwrt-19.07.8-${{ matrix.arch }}-v${{ env.CACHE_EPOCH }} + key: sysroot-openwrt-21.02.0-${{ matrix.arch }}-v${{ env.CACHE_EPOCH }} - id: ccache-timestamp run: echo "::set-output name=date::$(date +%s)" - name: Cache ccache files