From bd739eae8e98b4de6654ccddc8cc4de9a432bf57 Mon Sep 17 00:00:00 2001 From: Daniel Pawlik Date: Sun, 22 Sep 2024 18:07:22 +0200 Subject: [PATCH] Switch to be14-janusz-v9-320MHz; remove temporary luci patch; use openssl --- .github/workflows/bpi-r4-BE14-janusz.yaml | 23 +++++++++-------------- .github/workflows/bpi-r4-BE14.yaml | 15 ++++----------- configs/common/community | 1 + 3 files changed, 14 insertions(+), 25 deletions(-) diff --git a/.github/workflows/bpi-r4-BE14-janusz.yaml b/.github/workflows/bpi-r4-BE14-janusz.yaml index 1942d55..5fec87d 100644 --- a/.github/workflows/bpi-r4-BE14-janusz.yaml +++ b/.github/workflows/bpi-r4-BE14-janusz.yaml @@ -2,16 +2,16 @@ # hostapd: https://github.com/openwrt/openwrt/pull/16338 - probably # that change is raising issue with 6GHz network. Disabling... # Janusz fix: https://github.com/openwrt/openwrt/pull/16342 -# Luci fix: https://github.com/openwrt/luci/pull/7279 -name: BPI-R4 + BE14 + Luci + EHT fix by Janusz +# Luci fix (not included anymore): https://github.com/openwrt/luci/pull/7279 +name: BPI-R4 + BE14 + EHT fix by Janusz on: workflow_dispatch: env: REMOTE_REPOSITORY: danpawlik/openwrt - REMOTE_BRANCH: be14-and-hostapd-janusz-v8-320MHz-fix - RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4_be14_luci_eht + REMOTE_BRANCH: be14-janusz-v9-320MHz + RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4_be14_eht DEVICE_CONFIG: configs/mediatek/mt7988a/bpi-r4 ROLE_CONFIG: configs/common/main-router @@ -35,7 +35,7 @@ jobs: echo "latest_commit_sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT build: - name: Build BPI-R4 with BE14 + luci + eht by Janusz + name: Build BPI-R4 with BE14 + eht by Janusz needs: [check_commits] runs-on: ubuntu-24.04 steps: @@ -64,6 +64,8 @@ jobs: curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/mediatek/mt7988a/bpi-r4 > .config curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/luci >> .config curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/snapshot-short >> .config + sed -i '/CONFIG_PACKAGE_wpad-mbedtls=y/d' .config + curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/openssl >> .config curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/lte-5g-modem >> .config curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/community >> .config @@ -116,19 +118,12 @@ jobs: with: files: bin/targets/mediatek/filogic/* tag_name: ${{ env.RELEASE_PREFIX }}-${{ env.REMOTE_BRANCH }}-${{ env.RELEASE_DATE }} - name: OpenWRT BPI-R4 + BE14 + luci BE - ${{ env.REMOTE_BRANCH }} - ${{ env.RELEASE_DATE }} + name: OpenWRT BPI-R4 + BE14 - ${{ env.REMOTE_BRANCH }} - ${{ env.RELEASE_DATE }} body: | - Updated prebuilt images for ${{ env.RELEASE_DATE }} with BE14, Luci BE, basic 5G modem packages, that was + Updated prebuilt images for ${{ env.RELEASE_DATE }} with BE14, basic 5G modem packages, that was expected by the community members. Build Commit: ${{ needs.check_commits.outputs.latest_commit_sha }} - Includes Luci patches [1][2][3][4] - - [1] openwrt/luci#7279 - [2] openwrt/rpcd#5 - [3] openwrt/iwinfo#10 - [4] openwrt/iwinfo#11 - - name: Clean up old releases uses: dev-drprasad/delete-older-releases@master with: diff --git a/.github/workflows/bpi-r4-BE14.yaml b/.github/workflows/bpi-r4-BE14.yaml index 580aa51..b0bfd20 100644 --- a/.github/workflows/bpi-r4-BE14.yaml +++ b/.github/workflows/bpi-r4-BE14.yaml @@ -1,6 +1,6 @@ --- # Based on https://github.com/JuliusBairaktaris/Qualcommax_NSS_Builder/blob/main/.github/workflows/build.yaml -name: BPI-R4 + all packages + BE14 + Luci BE +name: BPI-R4 + all packages + BE14 on: workflow_dispatch: @@ -8,7 +8,7 @@ on: env: REMOTE_REPOSITORY: danpawlik/openwrt # REMOTE_BRANCH: be14 - REMOTE_BRANCH: be14-and-hostapd-janusz-v8-320MHz-fix + REMOTE_BRANCH: be14-janusz-v9-320MHz RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4_be14_all_packages_eht DEVICE_CONFIG: configs/mediatek/mt7988a/bpi-r4 ROLE_CONFIG: configs/common/main-router @@ -122,21 +122,14 @@ jobs: with: files: bin/targets/mediatek/filogic/* tag_name: ${{ env.RELEASE_PREFIX }}-${{ env.REMOTE_BRANCH }}-${{ env.RELEASE_DATE }} - name: OpenWRT BPI-R4 + BE14 + Luci BE + main_router packages - ${{ env.REMOTE_BRANCH }} - ${{ env.RELEASE_DATE }} + name: OpenWRT BPI-R4 + BE14 + main_router packages - ${{ env.REMOTE_BRANCH }} - ${{ env.RELEASE_DATE }} body: | Updated prebuilt images for ${{ env.RELEASE_DATE }} with BE14, hostapd and all main_router packages Build Commit: ${{ needs.check_commits.outputs.latest_commit_sha }} - Updated prebuilt images for ${{ env.RELEASE_DATE }} with BE14, Luci BE and main_router packages. + Updated prebuilt images for ${{ env.RELEASE_DATE }} with BE14 and main_router packages. Build Commit: ${{ needs.check_commits.outputs.latest_commit_sha }} - Includes Luci patches [1][2][3][4] - - [1] openwrt/luci#7279 - [2] openwrt/rpcd#5 - [3] openwrt/iwinfo#10 - [4] openwrt/iwinfo#11 - - name: Clean up old releases uses: dev-drprasad/delete-older-releases@master with: diff --git a/configs/common/community b/configs/common/community index 2bee81b..de0430e 100644 --- a/configs/common/community +++ b/configs/common/community @@ -7,6 +7,7 @@ CONFIG_PACKAGE_qrencode=y CONFIG_PACKAGE_tailscale=y CONFIG_PACKAGE_fail2ban=y CONFIG_PACKAGE_sqm-scripts=y +CONFIG_PACKAGE_luci-app-sqm=y CONFIG_PACKAGE_kmod-sched-core=y CONFIG_PACKAGE_kmod-nvme=y