update

kiddin9 · Jul 9, 2022 · 9a3a4a2 · 9a3a4a2
1 parent d5559e1
commit 9a3a4a2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 26 deletions.
diff --git a/devices/common/patches/targets.patch b/devices/common/patches/targets.patch
@@ -1,17 +1,15 @@
 --- a/include/target.mk
 +++ b/include/target.mk
-@@ -53,10 +53,10 @@ DEFAULT_PACKAGES.nas:=\
+@@ -53,10 +53,11 @@ DEFAULT_PACKAGES.nas:=\
  	mdadm
  # For router targets
  DEFAULT_PACKAGES.router:=\
 -	dnsmasq \
--	firewall4 \
--	nftables \
--	kmod-nft-offload \
 +	dnsmasq-full \
-+	firewall \
-+	iptables-legacy ip6tables-legacy kmod-ipt-nat6  ip6tables-mod-nat \
-+	kmod-ipt-offload \
+ 	firewall4 \
+ 	nftables \
+ 	kmod-nft-offload \
++	kmod-ipt-offload kmod-ipt-nat6  ip6tables-mod-nat \
  	odhcp6c \
  	odhcpd-ipv6only \
  	ppp \
diff --git a/devices/ramips_mt7621/diy.sh b/devices/ramips_mt7621/diy.sh
@@ -2,9 +2,5 @@
 
 shopt -s extglob
 
-#rm -Rf target/linux/{ramips,generic}
-#svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/ramips target/linux/ramips
-#svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic target/linux/generic
 
-#curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/include/kernel-5.4 -o include/kernel-5.4
 
diff --git a/devices/ramips_mt7621/patches/cr660x.patch b/devices/ramips_mt7621/patches/cr660x.patch
@@ -1,15 +1,3 @@
-From 593d238ebf777c36c9ee819a1e20f59da5adc361 Mon Sep 17 00:00:00 2001
-From: kiddin9 <48883331+kiddin9@users.noreply.github.com>
-Date: Tue, 5 Jul 2022 17:54:53 +0800
-Subject: [PATCH] Update mt7621.mk
-
-Signed-off-by: kiddin9 <48883331+kiddin9@users.noreply.github.com>
----
- target/linux/ramips/image/mt7621.mk | 46 +++++++++--------------------
- 1 file changed, 14 insertions(+), 32 deletions(-)
-
-diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
-index bdaeac2cb16e..72fbd3930a80 100644
 --- a/target/linux/ramips/image/mt7621.mk
 +++ b/target/linux/ramips/image/mt7621.mk
 @@ -223,7 +223,7 @@ define Device/asus_rt-n56u-b1
@@ -21,12 +9,21 @@ index bdaeac2cb16e..72fbd3930a80 100644
  endef
  TARGET_DEVICES += asus_rt-n56u-b1
 
+@@ -673,7 +673,7 @@ define Device/glinet_gl-mt1300
+   IMAGE_SIZE := 32448k
+   DEVICE_VENDOR := GL.iNet
+   DEVICE_MODEL := GL-MT1300
+-  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3
++  DEVICE_PACKAGES := kmod-mt7615d_dbdc kmod-usb3 -wpad-basic-wolfssl
+ endef
+ TARGET_DEVICES += glinet_gl-mt1300
+
 @@ -984,7 +984,7 @@ define Device/jcg_y2
    JCG_MAXSIZE := 16064k
    DEVICE_VENDOR := JCG
    DEVICE_MODEL := Y2
 -  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3
-+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware kmod-usb3 wpad-mini -wpad-basic-wolfssl -coremark -htop -bash -openssh-sftp-server
++  DEVICE_PACKAGES := kmod-mt7615d_dbdc kmod-usb3 -wpad-basic-wolfssl -coremark -htop -bash -openssh-sftp-server
  endef
  TARGET_DEVICES += jcg_y2
 
@@ -53,7 +50,7 @@ index bdaeac2cb16e..72fbd3930a80 100644
    DEVICE_ALT0_MODEL := KE 2P
    SUPPORTED_DEVICES += k2p
 -  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware
-+  DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware wpad-mini -wpad-basic-wolfssl -coremark -htop -bash -openssh-sftp-server
++  DEVICE_PACKAGES := kmod-mt7615d_dbdc -wpad-basic-wolfssl -coremark -htop -bash -openssh-sftp-server
  endef
  TARGET_DEVICES += phicomm_k2p
 
@@ -219,4 +216,4 @@ index bdaeac2cb16e..72fbd3930a80 100644
 +xiaomi,mi-router-cr660x)
  	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x10000" "0x20000"
  	;;
- esac
+ esac