update

README.md

@@ -1,6 +1,6 @@
 #### 一分钟在线编译定制专属固件: [supes.top](https://supes.top)
 #### 支持150+设备:
-X86/64, 友善 NanoPi、R2S、R4S、R4SE、R5S、R2C、NEO3, 斐讯 N1、K2P、K3, 树莓派 4B、3B/3B+、2B, DoorNet1, DoorNet2, 香橙派 R1 Plus、R1 Plus LTS, 红米AX6, 小米AX3600, 小米AX9000, 红米AX6S/小米AX3200, 红米AC2100, 小米AC2100, 斐讯K3,  360V6, 玩客云, 极路由 HIWIFI HC5962(极路由4、B70)、HC5661A、HC5761A、HC5861B, 小米4, 小米 R3G, 小米 R3P, newifi-d2 (新路由3), 小娱XY-C5, 竞斗云2.0(P&W R619AC), GL.iNet MT1300、AX1800、microuter-N300、MT300N V2, 小米CR660X(CR6606/CR6608/CR6609), 小米4A千兆版, 小米 R3G-v2, 小米青春版Nano, 迅雷下载宝 timecloud, 优酷 yk-l2, 有华 wr1200js, 向日葵 X3A, 华硕 ASUS RT-ACRH17、RT-AC58u/RT-ACRH13、RT-ac85p、RT-n56u-b1、RT-AC88U、RT-AC1200、RT-AC1200 V2, 网件 NETGEAR R6220、R6260、R6120、R6700-v2、R6800、R6850、R6900-v2、R7450、wndr3700-v5, H1 Box, 贝壳云P1, 我家云lL Pro, x96 Max, 微加云V-Plus, 章鱼星球ZYXQ, GT-King, Odroid N2, MXQ Pro+, 京东无线宝JDCloud RE-SP-01B, Linksys WRT1200AC、WRT1900AC v1、WRT1900AC v2、WRT3200ACM、WRT1900ACS v1、WRT1900ACS v2、WRT32X 等
+X86/64, 友善 NanoPi、R2S、R4S、R4SE、R5S、R2C、NEO3, 斐讯 N1、K2P、K3, 树莓派 4B、3B/3B+、2B, 电犀牛r68s、r66s, 香橙派 R1 Plus、R1 Plus LTS, 红米AX6, 小米AX3600, 小米AX9000, 红米AX6S/小米AX3200, 红米AC2100, 小米AC2100, 斐讯K3,  360V6, 玩客云, 极路由 HIWIFI HC5962(极路由4、B70)、HC5661A、HC5761A、HC5861B, 小米4, 小米 R3G, 小米 R3P, newifi-d2 (新路由3), 小娱XY-C5, 竞斗云2.0(P&W R619AC), GL.iNet GL-MT1300、GL-AX1800、GL-AXT1800、GL-microuter-N300、GL-MT300N V2, 小米CR660X(CR6606/CR6608/CR6609), 小米4A千兆版, 小米 R3G-v2, 小米青春版Nano, 迅雷下载宝 timecloud, 优酷 yk-l2, 有华 wr1200js, 向日葵 X3A, 华硕 ASUS RT-ACRH17、RT-AC58u/RT-ACRH13、RT-ac85p、RT-n56u-b1、RT-AC88U、RT-AC1200、RT-AC1200 V2, 网件 NETGEAR R6220、R6260、R6120、R6700-v2、R6800、R6850、R6900-v2、R7450、wndr3700-v5, H1 Box, 贝壳云P1, 我家云lL Pro, x96 Max, 微加云V-Plus, 章鱼星球ZYXQ, GT-King, Odroid N2, MXQ Pro+, 京东无线宝JDCloud RE-SP-01B, Linksys WRT1200AC、WRT1900AC v1、WRT1900AC v2、WRT3200ACM、WRT1900ACS v1、WRT1900ACS v2、WRT32X、EA7500 v2 等
 
 [1]: https://img.shields.io/badge/license-GPLV2-brightgreen.svg
 [2]: /LICENSE

devices/armvirt_64/diy/target/linux/armvirt/image/Makefile

@@ -100,6 +100,7 @@ define Image/Build
 	export BIN_DIR=$(BIN_DIR); \
 	export PARTSIZE=$(CONFIG_TARGET_ROOTFS_PARTSIZE); \
 	cd /www/wwwroot/op.supes.top/bcache/armvirt/64/openwrt_packit; \
+	. ../modify_packit.sh; \
 	if [ $(PROFILE_SANITIZED) == "n1" ]; then \
 		./mk_s905d_n1.sh; \
 	elif [ $(PROFILE_SANITIZED) == "beikeyun" ]; then \

devices/common/patches/iptables.patch

@@ -0,0 +1,34 @@
+--- a/package/network/utils/iptables/Makefile
++++ b/package/network/utils/iptables/Makefile
+@@ -111,7 +111,6 @@ define Package/arptables-nft
+ $(call Package/iptables/Default)
+   DEPENDS:=+kmod-nft-arp +xtables-nft +kmod-arptables
+   TITLE:=ARP firewall administration tool nft
+-  PROVIDES:=arptables
+   ALTERNATIVES:=\
+     300:/usr/sbin/arptables:/usr/sbin/xtables-nft-multi \
+     300:/usr/sbin/arptables-restore:/usr/sbin/xtables-nft-multi \
+@@ -122,7 +121,6 @@ define Package/ebtables-nft
+ $(call Package/iptables/Default)
+   DEPENDS:=+kmod-nft-bridge +xtables-nft +kmod-ebtables
+   TITLE:=Bridge firewall administration tool nft
+-  PROVIDES:=ebtables
+   ALTERNATIVES:=\
+     300:/usr/sbin/ebtables:/usr/sbin/xtables-nft-multi \
+     300:/usr/sbin/ebtables-restore:/usr/sbin/xtables-nft-multi \
+@@ -133,7 +131,6 @@ define Package/iptables-nft
+ $(call Package/iptables/Default)
+   TITLE:=IP firewall administration tool nft
+   DEPENDS:=+kmod-ipt-core +xtables-nft
+-  PROVIDES:=iptables
+   ALTERNATIVES:=\
+     300:/usr/sbin/iptables:/usr/sbin/xtables-nft-multi \
+     300:/usr/sbin/iptables-restore:/usr/sbin/xtables-nft-multi \
+@@ -486,7 +483,6 @@ define Package/ip6tables-nft
+ $(call Package/iptables/Default)
+   DEPENDS:=@IPV6 +kmod-ip6tables +xtables-nft
+   TITLE:=IP firewall administration tool nft
+-  PROVIDES:=ip6tables
+   ALTERNATIVES:=\
+     300:/usr/sbin/ip6tables:/usr/sbin/xtables-nft-multi \
+     300:/usr/sbin/ip6tables-restore:/usr/sbin/xtables-nft-multi \

devices/ipq60xx_generic/diy.sh

@@ -8,9 +8,9 @@ svn export --force https://github.com/coolsnowwolf/openwrt-gl-ax1800/trunk/packa
 
 svn co https://github.com/coolsnowwolf/openwrt-gl-ax1800/trunk/target/linux/generic target/linux/generic
 svn co https://github.com/coolsnowwolf/openwrt-gl-ax1800/trunk/target/linux/ipq60xx target/linux/ipq60xx
-svn co https://github.com/coolsnowwolf/openwrt-gl-ax1800/trunk/dl dl
+wget -P dl/ https://github.com/coolsnowwolf/openwrt-gl-ax1800/raw/master/dl/linux-4.4.60.tar.xz
 svn co https://github.com/coolsnowwolf/openwrt-gl-ax1800/trunk/package/kernel package/kernel
-svn co https://github.com/coolsnowwolf/openwrt-gl-ax1800/trunk/package/network/utils/fullconenat feeds/kiddin9/fullconenat
+svn co https://github.com/coolsnowwolf/openwrt-gl-ax1800/trunk/package/network/services/fullconenat feeds/kiddin9/fullconenat
 svn co https://github.com/coolsnowwolf/openwrt-gl-ax1800/trunk/package/network/config/netifd package/network/config/netifd
 svn co https://github.com/coolsnowwolf/openwrt-gl-ax1800/trunk/toolchain toolchain
 rm -rf target/linux/generic/files

devices/ipq60xx_generic/patches/fix.patch

@@ -141,12 +141,4 @@
 +	DEVICE_TITLE := Qihoo 360 V6
  	DEVICE_PACKAGES := kmod-usb3 kmod-usb-phy-msm
  endef
- 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
+ TARGET_DEVICES += qihoo_v6

devices/ramips_mt7621/patches/4a-breed-fix.patch

@@ -44,4 +44,16 @@
 +				reg = <0x50000 0xfb0000>;
  			};
  		};
- 	};
+ 	};
+
+--- a/target/linux/ramips/image/mt7621.mk
++++ b/target/linux/ramips/image/mt7621.mk
+@@ -1926,7 +1926,7 @@ TARGET_DEVICES += xiaomi_mi-router-3g
+ define Device/xiaomi_mi-router-3g-v2
+   $(Device/dsa-migration)
+   $(Device/uimage-lzma-loader)
+-  IMAGE_SIZE := 14848k
++  IMAGE_SIZE := 16064k
+   DEVICE_VENDOR := Xiaomi
+   DEVICE_MODEL := Mi Router 3G
+   DEVICE_VARIANT := v2

devices/ramips_mt7621/patches/jcg_q20-pb-boot.patch

@@ -0,0 +1,100 @@
+--- a/target/linux/ramips/dts/mt7621_jcg_q20.dts
++++ b/target/linux/ramips/dts/mt7621_jcg_q20.dts
+@@ -50,22 +50,6 @@
+ 			linux,code = <KEY_WPS_BUTTON>;
+ 		};
+ 	};
+-
+-	ubi-concat {
+-		compatible = "mtd-concat";
+-		devices = <&ubiconcat0 &ubiconcat1>;
+-
+-		partitions {
+-			compatible = "fixed-partitions";
+-			#address-cells = <1>;
+-			#size-cells = <1>;
+-
+-			partition@0 {
+-				label = "ubi";
+-				reg = <0x0 0x5900000>;
+-			};
+-		};
+-	};
+ };
+ 
+ &nand {
+@@ -79,12 +63,18 @@
+ 		partition@0 {
+ 			label = "Bootloader";
+ 			reg = <0x0 0x80000>;
+-			read-only;
+ 		};
+ 
+ 		partition@80000 {
+-			label = "Config";
+-			reg = <0x80000 0x80000>;
++			label = "Nvram";
++			reg = <0x80000 0x40000>;
++			read-only;
++		};
++
++		partition@c0000 {
++			label = "Bdata";
++			reg = <0xc0000 0x40000>;
++			read-only;
+ 		};
+ 
+ 		factory: partition@100000 {
+@@ -94,40 +84,26 @@
+ 		};
+ 
+ 		partition@180000 {
+-			label = "kernel";
+-			reg = <0x180000 0x400000>;
+-		};
+-
+-		ubiconcat0: partition@580000 {
+-			label = "ubiconcat0";
+-			reg = <0x580000 0x1c00000>;
+-		};
+-
+-		partition@2180000 {
+-			label = "firmware_backup";
+-			reg = <0x2180000 0x2000000>;
+-		};
+-
+-		partition@4180000 {
+-			label = "rootfs_data_back";
+-			reg = <0x4180000 0x80000>;
++			label = "crash";
++			reg = <0x180000 0x40000>;
+ 			read-only;
+ 		};
+ 
+-		partition@4200000 {
+-			label = "nvram_config";
+-			reg = <0x4200000 0x80000>;
++		partition@1c0000 {
++			label = "crash_log";
++			reg = <0x1c0000 0x40000>;
+ 			read-only;
+ 		};
+ 
+-		ubiconcat1: partition@4280000 {
+-			label = "ubiconcat1";
+-			reg = <0x4280000 0x3d00000>;
++		partition@200000 {
++			label = "kernel";
++			reg = <0x200000 0x400000>;
+ 		};
+ 
+-		/*
+-		 * last 512 KiB are for the bad block table
+-		 */
++		partition@600000 {
++			label = "ubi";
++			reg = <0x600000 0x7980000>;
++		};
+ 	};
+ };
+ 

devices/rockchip_armv8/diy.sh

@@ -16,6 +16,8 @@ svn export --force https://github.com/friendlyarm/friendlywrt/trunk/target/linux
 
 curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/package/kernel/linux/modules/video.mk -o package/kernel/linux/modules/video.mk
 
+sed -i "s/#TARGET_DEVICES += hinlink_opc-h68k/TARGET_DEVICES += hinlink_opc-h68k/" target/linux/rockchip/image/armv8.mk
+
 mv -f tmp/r8125 feeds/kiddin9/
 
 sed -i -e 's,kmod-r8168,kmod-r8169,g' target/linux/rockchip/image/armv8.mk