From 54973e84bbf653a39d37b22234104ac3bb12edf0 Mon Sep 17 00:00:00 2001
From: Daniel Pawlik <pawlik.dan@gmail.com>
Date: Tue, 17 Sep 2024 10:22:51 +0200
Subject: [PATCH] Switch branch to be14-and-hostapd-janusz-v6 that have Luci
 11BE patch

---
 .github/workflows/bpi-r4-BE14-janusz.yaml | 26 +++++++++++------------
 .github/workflows/bpi-r4-BE14.yaml        | 16 +++++++++++---
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/bpi-r4-BE14-janusz.yaml b/.github/workflows/bpi-r4-BE14-janusz.yaml
index b344dd8..3ea5ebb 100644
--- a/.github/workflows/bpi-r4-BE14-janusz.yaml
+++ b/.github/workflows/bpi-r4-BE14-janusz.yaml
@@ -2,6 +2,7 @@
 # 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
 
 on:
@@ -9,7 +10,7 @@ on:
 
 env:
   REMOTE_REPOSITORY: danpawlik/openwrt
-  REMOTE_BRANCH: be14-and-hostapd-janusz-v5
+  REMOTE_BRANCH: be14-and-hostapd-janusz-v6
   RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4_be14_luci_eht
   DEVICE_CONFIG: configs/mediatek/mt7988a/bpi-r4
   ROLE_CONFIG: configs/common/main-router
@@ -58,16 +59,6 @@ jobs:
         run: |
           ./scripts/feeds update -a && ./scripts/feeds install -a
 
-#      # NOTE: Temporary commented, due it is an error related to missing
-#      # deps like: iwinfo or rpcd.
-#      # Take patch for Luci for BE - https://github.com/openwrt/luci/pull/7271
-#      - name: Add patch for Luci BE wireless standard
-#        run: |
-#          cd feeds/luci
-#          git remote add lakd https://github.com/lakdif/luci
-#          git remote update lakd
-#          git cherry-pick -x e8910c7a3b70c2ea015129fe1811b732522feade
-
       - name: Configure firmware image
         run: |
           curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/mediatek/mt7988a/bpi-r4 > .config
@@ -145,12 +136,19 @@ jobs:
         with:
           files: bin/targets/mediatek/filogic/*
           tag_name: ${{ env.RELEASE_PREFIX }}-${{ env.REMOTE_BRANCH }}-${{ env.RELEASE_DATE }}
-          name: OpenWRT BPI-R4 + BE14 + luci + EHT - ${{ env.REMOTE_BRANCH }} - ${{ env.RELEASE_DATE }}
+          name: OpenWRT BPI-R4 + BE14 + luci BE - ${{ env.REMOTE_BRANCH }} - ${{ env.RELEASE_DATE }}
           body: |
-            Updated prebuilt images for ${{ env.RELEASE_DATE }} with BE14, updated hostapd, EHT support and
-            basic 5G modem packages, that was expected by the community members.
+            Updated prebuilt images for ${{ env.RELEASE_DATE }} with BE14, Luci BE, 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 141d264..2ba2d26 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 + eht
+name: BPI-R4 + all packages + BE14 + Luci BE
 
 on:
   workflow_dispatch:
@@ -8,7 +8,7 @@ on:
 env:
   REMOTE_REPOSITORY: danpawlik/openwrt
   # REMOTE_BRANCH: be14
-  REMOTE_BRANCH: be14-and-hostapd-janusz-v5
+  REMOTE_BRANCH: be14-and-hostapd-janusz-v6
   RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4_be14_all_packages_eht
   DEVICE_CONFIG: configs/mediatek/mt7988a/bpi-r4
   ROLE_CONFIG: configs/common/main-router
@@ -119,11 +119,21 @@ jobs:
         with:
           files: bin/targets/mediatek/filogic/*
           tag_name: ${{ env.RELEASE_PREFIX }}-${{ env.REMOTE_BRANCH }}-${{ env.RELEASE_DATE }}
-          name: OpenWRT BPI-R4 + BE14 + eht + main_router packages - ${{ env.REMOTE_BRANCH }} - ${{ env.RELEASE_DATE }}
+          name: OpenWRT BPI-R4 + BE14 + Luci BE + 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.
+            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: