fix: update minimal workflow for 24.10

Author: MoozIiSP

.github/workflows/BPI-R4-Minimal-MTK-Bootloader-Test.yml

@@ -1,4 +1,4 @@
-name: BPI-R4-Minimal-Bootloader-Test
+name: BPI-R4-Minimal-MTK-Bootloader-Test
 run-name: Minimal BPI-R4 test · ${{ inputs.media }} · ${{ github.ref_name }}
 
 on:
@@ -35,6 +35,7 @@ jobs:
             openwrt/dl
             openwrt/staging_dir
             openwrt/build_dir
+            # mtk-feed  # disabled for now; upstream URL currently 404
             bl-mt798x-dhcpd
           key: ${{ runner.os }}-openwrt-minimal-${{ hashFiles('SCRIPTS/01_get_ready_minimal.sh') }}-${{ hashFiles('SEED/BPI-R4-MINIMAL/config.seed') }}
           restore-keys: |
@@ -82,7 +83,7 @@ jobs:
             echo "=== Step 2: Prepare Package ==="
             cd openwrt
             bash ../SCRIPTS/02_prepare_package_minimal.sh
-            bash ../SCRIPTS/02_target_only_minimal.sh
+            bash ../SCRIPTS/BPI-R4/02_target_only_minimal.sh
             
             echo "=== Step 3: Config ==="
             cp -rf ../SEED/BPI-R4-MINIMAL/config.seed .config

SCRIPTS/01_get_ready.sh

@@ -60,6 +60,9 @@ clone_repo $dockerman_repo master dockerman &
 clone_repo $docker_lib_repo master docker_lib &
 clone_repo $luci_theme_design_repo master luci_theme_design_repo &
 # 等待所有后台任务完成
+# MTK Official Feed (disabled for now; upstream URL currently unavailable / 404)
+# clone_repo "https://git01.mediatek.com/openwrt/feeds/mtk-openwrt-feeds.git" "master" "mtk-feed" &
+
 # Custom Bootloader with DHCPD/WebUI (Yuzhii0718)
 clone_repo "https://github.com/Yuzhii0718/bl-mt798x-dhcpd.git" "master" "bl-mt798x-dhcpd" &
 

SCRIPTS/01_get_ready_minimal.sh

@@ -14,6 +14,7 @@ clone_repo() {
 
 latest_release="$(curl -s https://github.com/openwrt/openwrt/tags | grep -Eo 'v[0-9\.]+\-*r*c*[0-9]*.tar.gz' | grep 'v24.10' | sed -n 1p | sed 's/.tar.gz//g')"
 openwrt_repo="https://github.com/openwrt/openwrt.git"
+# mtk_feed_repo="https://git01.mediatek.com/openwrt/feeds/mtk-openwrt-feeds.git"  # disabled: upstream currently 404
 custom_bootloader_repo="https://github.com/Yuzhii0718/bl-mt798x-dhcpd.git"
 
 # Check if openwrt source exists and is a git repo
@@ -42,6 +43,7 @@ if [ ! -d "openwrt/.git" ]; then
 
   # 4. Clone other repos (if missing)
   clone_repo "$openwrt_repo" openwrt-24.10 openwrt_snap &
+  # clone_repo "$mtk_feed_repo" master mtk-feed &
   clone_repo "$custom_bootloader_repo" master bl-mt798x-dhcpd &
 
   wait
@@ -59,7 +61,8 @@ else
   echo "[MINIMAL] openwrt source detected."
   # Ensure sub-repos exist
   clone_repo "$openwrt_repo" openwrt-24.10 openwrt_snap
+  # clone_repo "$mtk_feed_repo" master mtk-feed
   clone_repo "$custom_bootloader_repo" master bl-mt798x-dhcpd
 fi
 
-echo "[MINIMAL] OpenWrt base and custom bootloader sources are ready."
+echo "[MINIMAL] OpenWrt base and custom bootloader sources are ready. (MTK feed currently disabled)"

SCRIPTS/02_prepare_package.sh

@@ -37,6 +37,14 @@ if ! ./scripts/feeds install -a; then
 fi
 
 ### 基础部分 ###
+# 可选：接入 MediaTek 的 OpenWrt feeds 或本地 SDK（当前默认禁用，因上游地址 404）
+# 如后续恢复可用，可重新启用下面逻辑：
+# MTK_FEED_URL=${MTK_FEED_URL:-https://git01.mediatek.com/openwrt/feeds/mtk-openwrt-feeds.git}
+# MTK_FEED_BRANCH=${MTK_FEED_BRANCH:-master}
+# if ! grep -qE "^src-git mtk " feeds.conf.default; then
+#   echo "src-git mtk ${MTK_FEED_URL};${MTK_FEED_BRANCH}" >> feeds.conf.default
+# fi
+
 ### Custom Bootloader (Yuzhii0718) & GPT for A/B Partition ###
 if [ -d "../bl-mt798x-dhcpd" ]; then
   echo "[BOOT] Found custom bootloader repo: bl-mt798x-dhcpd"
@@ -72,6 +80,7 @@ if [ -d "../bl-mt798x-dhcpd" ]; then
 
 
 ### WiFi regdb Optimization (OpenWrt tree only) ###
+# Former MTK feed-specific sync is intentionally disabled together with MTK feed integration.
 rm -rf ./package/firmware/wireless-regdb/patches/*
 cp ../PATCH/kernel/mtk_wifi/500-tx_power.patch ./package/firmware/wireless-regdb/patches/ 2>/dev/null || true
 if [ -f "../PATCH/kernel/mtk_wifi/regdb.Makefile" ]; then

SCRIPTS/02_prepare_package_minimal.sh

@@ -1,17 +1,25 @@
 #!/bin/bash
 set -euo pipefail
 
+sed_in_place() {
+  if sed --version >/dev/null 2>&1; then
+    sed -i "$@"
+  else
+    sed -i '' "$@"
+  fi
+}
+
 rewrite_feeds() {
   local pkg_src=$1
   local luci_src=$2
   local routing_src=$3
   local telephony_src=$4
   for feed_file in feeds.conf feeds.conf.default; do
     if [ -f "$feed_file" ]; then
-      sed -i "s#https://git.openwrt.org/feed/packages.git[^ ]*#$pkg_src#g" "$feed_file"
-      sed -i "s#https://git.openwrt.org/project/luci.git[^ ]*#$luci_src#g" "$feed_file"
-      sed -i "s#https://git.openwrt.org/feed/routing.git[^ ]*#$routing_src#g" "$feed_file"
-      sed -i "s#https://git.openwrt.org/feed/telephony.git[^ ]*#$telephony_src#g" "$feed_file"
+      sed_in_place "s#https://git.openwrt.org/feed/packages.git[^ ]*#$pkg_src#g" "$feed_file"
+      sed_in_place "s#https://git.openwrt.org/project/luci.git[^ ]*#$luci_src#g" "$feed_file"
+      sed_in_place "s#https://git.openwrt.org/feed/routing.git[^ ]*#$routing_src#g" "$feed_file"
+      sed_in_place "s#https://git.openwrt.org/feed/telephony.git[^ ]*#$telephony_src#g" "$feed_file"
     fi
   done
 }
@@ -21,6 +29,13 @@ rewrite_feeds "https://github.com/openwrt/packages.git;openwrt-24.10" \
               "https://github.com/openwrt/routing.git;openwrt-24.10" \
               "https://github.com/openwrt/telephony.git;openwrt-24.10"
 
+# MTK feed integration intentionally disabled for now because the upstream URL currently returns 404.
+# MTK_FEED_URL=${MTK_FEED_URL:-https://git01.mediatek.com/openwrt/feeds/mtk-openwrt-feeds.git}
+# MTK_FEED_BRANCH=${MTK_FEED_BRANCH:-master}
+# if ! grep -qE "^src-git mtk " feeds.conf.default; then
+#   echo "src-git mtk ${MTK_FEED_URL};${MTK_FEED_BRANCH}" >> feeds.conf.default
+# fi
+
 if ! ./scripts/feeds update -a; then
   echo "GitHub 镜像更新失败，尝试切换回官方源..."
   rewrite_feeds "https://git.openwrt.org/feed/packages.git;openwrt-24.10" \
@@ -31,6 +46,7 @@ if ! ./scripts/feeds update -a; then
 fi
 
 ./scripts/feeds install -a
+# ./scripts/feeds install -a -p mtk -f || true
 
 if [ -d "../bl-mt798x-dhcpd" ]; then
   echo "[BOOT] Found custom bootloader repo: bl-mt798x-dhcpd"
@@ -60,10 +76,10 @@ else
   echo "[BOOT] Custom bootloader repo not found, using default OpenWrt sources"
 fi
 
-sed -i 's,-SNAPSHOT,,g' include/version.mk
-sed -i 's,-SNAPSHOT,,g' package/base-files/image-config.in
-sed -i '/CONFIG_BUILDBOT/d' include/feeds.mk
-sed -i 's/;)\s*\\/; \\/' include/feeds.mk
-sed -i 's,CONFIG_WERROR=y,# CONFIG_WERROR is not set,g' target/linux/generic/config-6.6 || true
+sed_in_place 's,-SNAPSHOT,,g' include/version.mk
+sed_in_place 's,-SNAPSHOT,,g' package/base-files/image-config.in
+sed_in_place '/CONFIG_BUILDBOT/d' include/feeds.mk
+sed_in_place 's/;)\s*\\/; \\/' include/feeds.mk
+sed_in_place 's,CONFIG_WERROR=y,# CONFIG_WERROR is not set,g' target/linux/generic/config-6.6 || true
 
 echo "[MINIMAL] Minimal package preparation complete."

SCRIPTS/BPI-R4/02_target_only_minimal.sh

@@ -1,12 +1,20 @@
 #!/bin/bash
 set -euo pipefail
 
-sed -i 's,-mcpu=generic,-march=armv8-a+crc+crypto,g' include/target.mk
+sed_in_place() {
+  if sed --version >/dev/null 2>&1; then
+    sed -i "$@"
+  else
+    sed -i '' "$@"
+  fi
+}
+
+sed_in_place 's,-mcpu=generic,-march=armv8-a+crc+crypto,g' include/target.mk
 
 latest_version="$(curl -s https://github.com/openwrt/openwrt/tags | grep -Eo 'v[0-9\\.]+\\-*r*c*[0-9]*.tar.gz' | grep 'v24.10' | sed -n 1p | sed 's/v//g' | sed 's/.tar.gz//g')"
 wget -q https://downloads.openwrt.org/releases/${latest_version}/targets/mediatek/filogic/profiles.json
 jq -r '.linux_kernel.vermagic' profiles.json > .vermagic
-sed -i -e 's/^\(.\).*vermagic$/\1cp $(TOPDIR)\/.vermagic $(LINUX_DIR)\/.vermagic/' include/kernel-defaults.mk
+sed_in_place -e 's/^\(.\).*vermagic$/\1cp $(TOPDIR)\/.vermagic $(LINUX_DIR)\/.vermagic/' include/kernel-defaults.mk
 
 find ./ -name '*.orig' -delete
 find ./ -name '*.rej' -delete