From 485a54b95892f0b5e6ba62ebbd63dce0d63562c1 Mon Sep 17 00:00:00 2001
From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
Date: Sat, 21 Dec 2024 18:36:48 +0800
Subject: [PATCH] update

---
 devices/common/patches/luci-base.patch          |  6 ++++--
 devices/qualcommax_ipq807x/patches/ap8220.patch | 16 ++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/devices/common/patches/luci-base.patch b/devices/common/patches/luci-base.patch
index 48e15f0c2bd6..9a3aec07a83c 100644
--- a/devices/common/patches/luci-base.patch
+++ b/devices/common/patches/luci-base.patch
@@ -1,6 +1,6 @@
 --- a/package/feeds/luci/luci-base/root/usr/share/rpcd/ucode/luci
 +++ b/package/feeds/luci/luci-base/root/usr/share/rpcd/ucode/luci
-@@ -192,11 +192,13 @@ const methods = {
+@@ -192,6 +192,7 @@ const methods = {
  
  	getFeatures: {
  		call: function() {
@@ -8,7 +8,9 @@
  			let result = {
  				firewall:   access('/sbin/fw3') == true,
  				firewall4:  access('/sbin/fw4') == true,
- 				opkg:       access('/bin/opkg') == true,
+@@ -199,6 +200,7 @@ const methods = {
+ 				bonding:    access('/sys/module/bonding'),
+ 				mii_tool:   access('/usr/sbin/mii-tool'),
  				offloading: access('/sys/module/xt_FLOWOFFLOAD/refcnt') == true || access('/sys/module/nft_flow_offload/refcnt') == true,
 +				fullcone:   access(`/lib/modules/${kernel_version}/xt_FULLCONENAT.ko`) == true || access(`/lib/modules/${kernel_version}/nft_fullcone.ko`) == true,
  				br2684ctl:  access('/usr/sbin/br2684ctl') == true,
diff --git a/devices/qualcommax_ipq807x/patches/ap8220.patch b/devices/qualcommax_ipq807x/patches/ap8220.patch
index ee4a3551dbeb..7de79be2820d 100644
--- a/devices/qualcommax_ipq807x/patches/ap8220.patch
+++ b/devices/qualcommax_ipq807x/patches/ap8220.patch
@@ -46,17 +46,17 @@
  	asus,rt-ax89x)
  		ucidef_set_interfaces_lan_wan "10g-sfp 10g-copper lan1 lan2 lan3 lan4 lan5 lan6 lan7 lan8" "wan"
  		;;
-@@ -97,7 +100,10 @@ ipq807x_setup_macs()
- 			[ "$wan_mac" != "00:00:00:00:00:00" ] || wan_mac="$(get_mac_binary "$(find_mtd_chardev mac)" 0x20000)"
- 			lan_mac="$(macaddr_add "$wan_mac" 1)"
- 			label_mac="$wan_mac"
--
-+		;;
+@@ -80,6 +80,10 @@ ipq807x_setup_macs()
+ 	local label_mac=""
+ 
+ 	case "$board" in
 +		aliyun,ap8220)
 +			wan_mac=$(cat /dev/mtd12 | head -n 4 | grep "product.mac" | awk -F " " '{print $2}')
 +			lan_mac=$(macaddr_add "$wan_mac" 1)
- 		;;
- 	esac
++ 		;;
+ 		linksys,mx4200v2)
+ 			label_mac=$(mtd_get_mac_ascii devinfo hw_mac_addr)
+ 			for i in $(seq 3 5); do
 
 --- a/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh