update

devices/common/diy.sh

@@ -9,7 +9,7 @@ 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-advanced luci-app-firewall luci-app-gpsysupgrade luci-app-opkg luci-app-upnp luci-app-autoreboot \
 luci-app-wizard luci-base luci-compat luci-lib-ipkg luci-lib-fs \
-coremark wget-ssl curl htop nano zram-swap kmod-lib-zstd kmod-tcp-bbr bash openssh-sftp-server block-mount /" include/target.mk
+coremark wget-ssl curl htop nano zram-swap kmod-lib-zstd kmod-tcp-bbr bash openssh-sftp-server block-mount resolveip kmod-ip6-tunnel ds-lite /" include/target.mk
 sed -i "s/procd-ujail//" include/target.mk
 
 sed -i '/	refresh_config();/d' scripts/feeds

devices/common/patches/download.patch

@@ -0,0 +1,13 @@
+--- a/scripts/download.pl
++++ b/scripts/download.pl
+@@ -80,8 +80,8 @@ ($)
+ 	}
+ 
+ 	return $have_curl
+-		? (qw(curl -f --connect-timeout 20 --retry 5 --location --insecure), shellwords($ENV{CURL_OPTIONS} || ''), $url)
+-		: (qw(wget --tries=5 --timeout=20 --no-check-certificate --output-document=-), shellwords($ENV{WGET_OPTIONS} || ''), $url)
++		? (qw(curl -f --connect-timeout 5 -m 30 --retry 3 --location --insecure), shellwords($ENV{CURL_OPTIONS} || ''), $url)
++		: (qw(wget --tries=3 --timeout=20 --no-check-certificate --output-document=-), shellwords($ENV{WGET_OPTIONS} || ''), $url)
+ 	;
+ }
+ 

devices/ipq60xx_generic/.config

@@ -2,12 +2,9 @@
 CONFIG_TARGET_ipq60xx=y
 CONFIG_TARGET_ipq60xx_generic=y
 CONFIG_TARGET_MULTI_PROFILE=y
-CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_cmiot_ax18=y
-CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_glinet_gl-ax1800=y
-CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_glinet_gl-axt1800=y
-CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_linksys_mr7350=y
-CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_qihoo_v6=y
-CONFIG_TARGET_DEVICE_ipq60xx_generic_DEVICE_zn_m2=y
+CONFIG_TARGET_ALL_PROFILES=y
+
+CONFIG_PACKAGE_dockerd=n
 
 CONFIG_GCC_USE_VERSION_7=y
 CONFIG_PACKAGE_kmod-dm-raid=n

devices/ipq60xx_generic/diy.sh

@@ -19,8 +19,6 @@ rm -rf package/network/config/netifd/patches
 curl -sfL https://raw.githubusercontent.com/coolsnowwolf/openwrt-gl-ax1800/master/include/netfilter.mk -o include/netfilter.mk
 curl -sfL https://raw.githubusercontent.com/coolsnowwolf/openwrt-gl-ax1800/master/include/quilt.mk -o include/quilt.mk
 
-sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += automount/' target/linux/ipq60xx/Makefile
-
 rm -f devices/common/patches/usb.patch
 rm -rf feeds/packages/net/openvswitch feeds/kiddin9/shortcut-fe feeds/packages/net/xtables-addons package/kernel/mt76
 

devices/ipq60xx_generic/diy/target/linux/ipq60xx/patches-4.4/998-fix_yylloc_error.patch

@@ -1,9 +0,0 @@
---- a/scripts/dtc/dtc-parser.tab.c_shipped
-+++ b/scripts/dtc/dtc-parser.tab.c_shipped
-@@ -1197,5 +1197,5 @@
- YYSTYPE yylval;
- /* Location data for the lookahead symbol.  */
--YYLTYPE yylloc
-+extern YYLTYPE yylloc
- # if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-   = { 1, 1, 1, 1 }

devices/ipq60xx_generic/patches/fix.patch

@@ -58,11 +58,22 @@
    SECTION:=net
    CATEGORY:=Base system
    TITLE:=OpenWrt C Firewall
--  DEPENDS:=+libubox +libubus +libuci +libip4tc +IPV6:libip6tc +libiptext +IPV6:libiptext6 +libxtables +kmod-ipt-core +kmod-ipt-conntrack +IPV6:kmod-nf-conntrack6 +iptables-mod-fullconenat +ip6tables-mod-fullconenat +iptables +ip6tables +kmod-ipt-offload
-+  DEPENDS:=+libubox +libubus +libuci +libip4tc +IPV6:libip6tc +libiptext +IPV6:libiptext6 +libxtables +kmod-ipt-core +kmod-ipt-conntrack +IPV6:kmod-nf-conntrack6 +iptables-mod-fullconenat +iptables +ip6tables +kmod-ipt-offload
+-  DEPENDS:=+libubox +libubus +libuci +libip4tc +IPV6:libip6tc +libiptext +IPV6:libiptext6 +libxtables +kmod-ipt-core +kmod-ipt-conntrack +IPV6:kmod-nf-conntrack6 +kmod-ipt-nat +kmod-ipt-nat6 +iptables-mod-fullconenat +ip6tables-mod-fullconenat +iptables +ip6tables +kmod-ipt-offload
++  DEPENDS:=+libubox +libubus +libuci +libip4tc +IPV6:libip6tc +libiptext +IPV6:libiptext6 +libxtables +kmod-ipt-core +kmod-ipt-conntrack +IPV6:kmod-nf-conntrack6 +kmod-ipt-nat +kmod-ipt-nat6 +iptables-mod-fullconenat +iptables +ip6tables +kmod-ipt-offload
    PROVIDES:=uci-firewall
  endef
 
+--- a/feeds/kiddin9/automount/Makefile
++++ b/feeds/kiddin9/automount/Makefile
+@@ -28,7 +28,6 @@ define Package/automount
+     +kmod-usb-storage-extras \
+     +!TARGET_ramips:kmod-usb-storage-uas \
+     +kmod-fs-ext4 \
+-    +!LINUX_5_4:kmod-fs-exfat \
+     +LINUX_5_4:kmod-fs-exfat0 \
+     +kmod-fs-vfat
+     +!LINUX_5_15:ntfs-3g
+
 --- a/include/target.mk
 +++ b/include/target.mk
 @@ -147,10 +147,17 @@ ifneq ($(TARGET_BUILD)$(if $(DUMP),,1),)
@@ -122,7 +133,7 @@
 
 --- a/target/linux/ipq60xx/image/Makefile
 +++ b/target/linux/ipq60xx/image/Makefile
-@@ -102,7 +102,7 @@ define Device/qihoo_v6
+@@ -103,7 +103,7 @@ define Device/qihoo_v6
  	PAGESIZE := 2048
  	DEVICE_DTS := qcom-ipq6018-qihoo-v6
  	DEVICE_DTS_CONFIG := config@cp03-c1
@@ -130,4 +141,12 @@
 +	DEVICE_TITLE := Qihoo 360 V6
  	DEVICE_PACKAGES := kmod-usb3 kmod-usb-phy-msm
  endef
- TARGET_DEVICES += qihoo_v6
+ TARGET_DEVICES += qihoo_v6
+@@ -114,6 +114,7 @@ define Device/xiaomi_redmi-ax5-jdcloud
+ 	BLOCKSIZE := 64k
+ 	KERNEL_SIZE := 6144k
+ 	DEVICE_TITLE := Xiaomi Redmi Router AX5 JDCloud
++	DEVICE_DTS := qcom-ipq6018-redmi-ax5-jdcloud
+ 	DEVICE_DTS_CONFIG := config@cp03-c1
+ 	IMAGES += factory.bin
+ 	IMAGE/factory.bin := append-kernel | pad-to 6144k |	append-rootfs | append-metadata

devices/ramips_mt7621/.config

@@ -29,6 +29,7 @@ CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_jcg_q20=y
 CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_gehua_ghl-r-001=y
 CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_raisecom_msg1500-x-00=y
 CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_zte_e8820s=y
+CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_linksys_ea7500-v2=y
 
 CONFIG_PACKAGE_luci-ssl=y # uhttpd服务