Fix

missing233 · Mar 11, 2024 · 0a5aacb · 0a5aacb
1 parent e9f8622
commit 0a5aacb
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/.github/workflows/build-openwrt.yml b/.github/workflows/build-openwrt.yml
@@ -321,11 +321,8 @@ jobs:
       - name: 修复问题
         working-directory: ${{ env.OPENWRT_ROOT_PATH }}
         run: |
-          sed -i 's/^  DEPENDS:= +kmod-crypto-manager +kmod-crypto-pcbc +kmod-crypto-fcrypt$/  DEPENDS:= +kmod-crypto-manager +kmod-crypto-pcbc +kmod-crypto-fcrypt +kmod-udptunnel4 +kmod-udptunnel6/' package/kernel/linux/modules/netsupport.mk #https://github.com/openwrt/openwrt/commit/ecc53240945c95bc77663b79ccae6e2bd046c9c8
-          sed -i 's/^	dnsmasq \\$/	dnsmasq-full \\/g' ./include/target.mk
-          sed -i 's/256/1024/' ./target/linux/${{ matrix.target }}/image/Makefile
-          sed -i 's/^	b43-fwsquash.py "$(CONFIG_B43_FW_SQUASH_PHYTYPES)" "$(CONFIG_B43_FW_SQUASH_COREREVS)"/	$(TOPDIR)\/tools\/b43-tools\/files\/b43-fwsquash.py "$(CONFIG_B43_FW_SQUASH_PHYTYPES)" "$(CONFIG_B43_FW_SQUASH_COREREVS)"/' ./package/kernel/mac80211/broadcom.mk
-
+          bash $GITHUB_WORKSPACE/scripts/fix_problem.sh
+          
       - name: 更新 feeds
         working-directory: ${{ env.OPENWRT_ROOT_PATH }}
         run: |

diff --git a/config/x86_64/network.config b/config/x86_64/network.config
@@ -50,7 +50,6 @@ CONFIG_PACKAGE_chat=y
 CONFIG_PACKAGE_etherwake=y
 CONFIG_PACKAGE_ethtool-full=y
 CONFIG_PACKAGE_hysteria=y
-CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_ipset=y
 CONFIG_PACKAGE_ipt2socks=y
 CONFIG_PACKAGE_iputils-arping=y

diff --git a/config/x86_64/other.config b/config/x86_64/other.config
@@ -313,7 +313,6 @@ CONFIG_PACKAGE_libffi=y
 CONFIG_PACKAGE_libgcrypt=y
 CONFIG_PACKAGE_libgdbm=y
 CONFIG_PACKAGE_libgpg-error=y
-CONFIG_PACKAGE_libiperf3=y
 CONFIG_PACKAGE_libiwinfo=y
 CONFIG_PACKAGE_libkmod=y
 CONFIG_PACKAGE_libltdl=y

diff --git a/scripts/fix_problem.sh b/scripts/fix_problem.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+config=$1
+openwrt_tag_branch=$(sed -n '/openwrt_tag\/branch/p' $GITHUB_WORKSPACE/config/"$config"/OpenWrt-K/compile.config | sed -e 's/.*=//')
+sed -i 's/^  DEPENDS:= +kmod-crypto-manager +kmod-crypto-pcbc +kmod-crypto-fcrypt$/  DEPENDS:= +kmod-crypto-manager +kmod-crypto-pcbc +kmod-crypto-fcrypt +kmod-udptunnel4 +kmod-udptunnel6/' package/kernel/linux/modules/netsupport.mk #https://github.com/openwrt/openwrt/commit/ecc53240945c95bc77663b79ccae6e2bd046c9c8
+sed -i 's/^	dnsmasq \\$/	dnsmasq-full \\/g' ./include/target.mk
+sed -i 's/^	b43-fwsquash.py "$(CONFIG_B43_FW_SQUASH_PHYTYPES)" "$(CONFIG_B43_FW_SQUASH_COREREVS)"/	$(TOPDIR)\/tools\/b43-tools\/files\/b43-fwsquash.py "$(CONFIG_B43_FW_SQUASH_PHYTYPES)" "$(CONFIG_B43_FW_SQUASH_COREREVS)"/' ./package/kernel/mac80211/broadcom.mk
+# https://github.com/openwrt/packages/pull/22251
+if [[ "$openwrt_tag_branch" == "v23.05.0-rc4" ]] ; then
+  if grep -q "^define Package/prometheus-node-exporter-lua-bmx6$" "feeds/packages/utils/prometheus-node-exporter-lua/Makefile"; then
+    echo "修复https://github.com/openwrt/packages/pull/22251"
+    curl -s -L --retry 6 https://github.com/openwrt/packages/commit/361b360d2bbf7abe93241f6eaa12320d8d83475a.patch  | patch -p1 -d feeds/packages 2>/dev/null
+  fi
+fi
+if [[ "$openwrt_tag_branch" == "v23.05.2" ]] ; then
+  if ! grep -q "^  CONFLICTS:=iperf3$" "feeds/packages/net/iperf3/Makefile"; then
+    echo "修复iperf3冲突"
+    curl -s -L --retry 6 https://github.com/openwrt/packages/commit/cea45c75c0153a190ee41dedaf6526ae08e33928.patch  | patch -p1 -d feeds/packages 2>/dev/null
+  fi
+fi