update

kiddin9 · Feb 9, 2025 · 531ac93 · 531ac93
1 parent 34e4d5a
commit 531ac93
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 818 deletions.
diff --git a/devices/common/diy.sh b/devices/common/diy.sh
@@ -31,7 +31,7 @@ wget -N https://github.com/immortalwrt/immortalwrt/raw/refs/heads/openwrt-24.10/
 
 echo "$(date +"%s")" >version.date
 sed -i '/$(curdir)\/compile:/c\$(curdir)/compile: package/opkg/host/compile' package/Makefile
-sed -i "s/DEFAULT_PACKAGES:=/DEFAULT_PACKAGES:=luci-app-advancedplus luci-app-firewall luci-app-package-manager luci-app-upnp luci-app-syscontrol \
+sed -i "s/DEFAULT_PACKAGES:=/DEFAULT_PACKAGES:=luci-app-advancedplus luci-app-firewall luci-app-package-manager luci-app-upnp luci-app-syscontrol luci-proto-wireguard \
 luci-app-wizard luci-base luci-compat luci-lib-ipkg luci-lib-fs \
 coremark wget-ssl curl autocore htop nano zram-swap kmod-lib-zstd kmod-tcp-bbr bash openssh-sftp-server block-mount resolveip ds-lite swconfig luci-app-fan luci-app-filemanager /" include/target.mk
 
@@ -59,8 +59,6 @@ wget -N https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/
 
 wget -N https://patch-diff.githubusercontent.com/raw/openwrt/openwrt/pull/16414.patch -P devices/common/patches/
 
-sed -i "/mediaurlbase/d" package/feeds/*/luci-theme*/root/etc/uci-defaults/*
-
 # find target/linux/x86 -name "config*" -exec bash -c 'cat kernel.conf >> "{}"' \;
 sed -i 's/max_requests 3/max_requests 20/g' package/network/services/uhttpd/files/uhttpd.config
 #rm -rf ./feeds/packages/lang/{golang,node}

diff --git a/devices/common/patches/base-files.patch b/devices/common/patches/base-files.patch
@@ -1,3 +1,30 @@
+--- a/package/base-files/files/etc/rc.common
++++ b/package/base-files/files/etc/rc.common
+@@ -28,7 +28,9 @@ restart() {
+ }
+
+ boot() {
+-	start "$@"
++	name="$(basename "${initscript}")"
++	name="${name##S[0-9][0-9]}"
++	[[ "$(uci -q get $name.$name[0].enabled)" == 0 || "$(uci -q get $name.config.enabled)" == 0 || "$(uci -q get $name.$name.enabled)" == 0 || "$(uci -q get $name.main.enabled)" == 0 || "$(uci -q get $name.$name[0].enable)" == 0 || "$(uci -q get $name.config.enable)" == 0 || "$(uci -q get $name.$name.enable)" == 0 || "$(uci -q get $name.main.enable)" == 0 ]] || start "$@";
+ }
+
+ shutdown() {
+
+--- a/package/base-files/files/lib/functions.sh
++++ b/package/base-files/files/lib/functions.sh
+@@ -395,7 +395,9 @@ default_postinst() {
+ 			if [ "$PKG_UPGRADE" != "1" ]; then
+ 				"$i" enable
+ 			fi
+-			"$i" start
++			if "$i" enabled; then
++				"$i" start
++			fi
+ 		fi
+ 	done
+
 --- a/package/base-files/files/etc/shinit
 +++ b/package/base-files/files/etc/shinit
 @@ -2,6 +2,8 @@

diff --git a/devices/common/patches/luci-base.patch b/devices/common/patches/luci-base.patch
@@ -165,7 +165,7 @@
  	shift; shift
 
 -	if [ -x "$init" ] && "$init" enabled && ! grep -sqE 'USE_PROCD=.' "$init"; then
-+	if [ -x "$init" ] && "$init" enabled && ! grep -sq 'procd_add_reload_trigger' "$init"; then
++	if [ -x "$init" ] && ! grep -sqE 'USE_PROCD=.' "$init"; then
  		logger -t "ucitrack" "Setting up /etc/config/$config reload trigger for non-procd $init"
  		procd_add_config_trigger "config.change" "$config" "$init" "$@"
  	fi
diff --git a/devices/mediatek_filogic/diy/target/linux/mediatek/dts/mt7981b-cudy-tr3000-mod.dts b/devices/mediatek_filogic/diy/target/linux/mediatek/dts/mt7981b-cudy-tr3000-mod.dts
@@ -5,16 +5,17 @@
 
 / {
 	model = "Cudy TR3000 (U-Boot mod)";
-	compatible = "cudy,tr3000-mod", "mediatek,mt7981-spim-snand-rfb";
+	compatible = "cudy,tr3000-mod", "mediatek,mt7981";
 };
 
 &spi0 {
 	flash@0 {
 		partitions {
-			partition@580000 {
+			partition@5c0000 {
 				label = "ubi";
-				reg = <0x5C0000 0x7000000>;
+				reg = <0x5c0000 0x7000000>;
 			};
 		};
 	};
 };
+
diff --git a/...ediatek_filogic/diy/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-ax3000t-an8855.dts b/...ediatek_filogic/diy/target/linux/mediatek/dts/mt7981b-xiaomi-mi-router-ax3000t-an8855.dts