kiddin9 2 жил өмнө
parent
commit
5f87ebf7cb

+ 1 - 1
devices/common/diy.sh

@@ -41,7 +41,7 @@ sed -i "s/192.168.1/10.0.0/" package/base-files/files/bin/config_generate
 svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/hack-5.15 target/linux/generic/hack-5.15
 svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic/backport-5.15 target/linux/generic/backport-5.15
 find target/linux/generic/backport-5.15 -name "[0-9][0-9][0-9]-[a-z][a-z]*" -exec rm -f {} \;
-rm -rf target/linux/generic/backport-5.15/{799-v6.0-net-mii*,802-v6.1-nvmem*,803-v5.19-nvmem*,733-v6.2-02-net-mediatek-sgmii-ensure*,733-v6.2-03-net-mediatek*,733-v6.2-04-mtk_sgmii-enable*,775-v5.16-net-phylink*,776-v5.16-net-ethernet-*,890-v6.1-mtd-spinand-winbond*,891-v6.1-mtd-spinand-winbond*}
+rm -rf target/linux/generic/backport-5.15/{799-v6.0-net-mii*,802-v6.1-nvmem*,803-v5.19-nvmem*,733-v6.2-02-net-mediatek-sgmii-ensure*,733-v6.2-03-net-mediatek*,733-v6.2-04-mtk_sgmii-enable*,733-v6.4-21-net-mtk_eth_soc*,733-v6.4-22-net-ethernet-mtk*,775-v5.16-net-phylink*,776-v5.16-net-ethernet-*,890-v6.1-mtd-spinand-winbond*,891-v6.1-mtd-spinand-winbond*}
 curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/target/linux/generic/pending-5.15/613-netfilter_optional_tcp_window_check.patch -o target/linux/generic/pending-5.15/613-netfilter_optional_tcp_window_check.patch
 sed -i "s/CONFIG_WERROR=y/CONFIG_WERROR=n/" target/linux/generic/config-5.15
 ) &

+ 9 - 9
devices/common/patches/mt7922.patch

@@ -1,6 +1,6 @@
 --- a/package/kernel/mt76/Makefile
 +++ b/package/kernel/mt76/Makefile
-@@ -243,6 +243,12 @@ define KernelPackage/mt7921-firmware
+@@ -262,6 +262,12 @@ define KernelPackage/mt7921-firmware
    TITLE:=MediaTek MT7921 firmware
  endef
  
@@ -10,10 +10,10 @@
 +  TITLE:=MediaTek MT7922 firmware
 +endef
 +
- define KernelPackage/mt7921-common
+ define KernelPackage/mt792x-common
    $(KernelPackage/mt76-default)
-   TITLE:=MediaTek MT7615 wireless driver common code
-@@ -501,6 +507,14 @@ define KernelPackage/mt7921-firmware/install
+   TITLE:=MediaTek MT792x wireless driver common code
+@@ -555,6 +561,14 @@ define KernelPackage/mt7921-firmware/install
  		$(1)/lib/firmware/mediatek
  endef
  
@@ -28,11 +28,11 @@
  define Package/mt76-test/install
  	mkdir -p $(1)/usr/sbin
  	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/mt76-test $(1)/usr/sbin
-@@ -531,6 +545,7 @@ $(eval $(call KernelPackage,mt7915e))
- $(eval $(call KernelPackage,mt7916-firmware))
+@@ -588,6 +602,7 @@ $(eval $(call KernelPackage,mt7916-firmware))
+ $(eval $(call KernelPackage,mt7981-firmware))
  $(eval $(call KernelPackage,mt7986-firmware))
  $(eval $(call KernelPackage,mt7921-firmware))
 +$(eval $(call KernelPackage,mt7922-firmware))
- $(eval $(call KernelPackage,mt7921-common))
- $(eval $(call KernelPackage,mt7921u))
- $(eval $(call KernelPackage,mt7921s))
+ $(eval $(call KernelPackage,mt792x-common))
+ $(eval $(call KernelPackage,mt792x-usb))
+ $(eval $(call KernelPackage,mt7921-common))

+ 1 - 1
devices/common/settings.ini

@@ -1,5 +1,5 @@
 REPO_URL="https://github.com/openwrt/openwrt"
-REPO_BRANCH=""
+REPO_BRANCH="openwrt-23.05"
 CONFIG_FILE=".config"
 DIY_SH="diy.sh"
 FREE_UP_DISK="false"

+ 4 - 2
devices/mediatek_mt7981/diy.sh

@@ -4,9 +4,9 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-rm -rf feeds/kiddin9/{rtl*,shortcut-fe,nft-fullcone}
+rm -rf feeds/kiddin9/{rtl*,shortcut-fe,fullconenat-nft} package/feeds/luci/rpcd-mod-luci toolchain/musl package/feeds/packages/gptfdisk package/utils/f2fs-tools package/utils/e2fsprogs package/libs/libselinux package/feeds/packages/acl
 
-rm -rf devices/common/patches/{fix.patch,iptables.patch,kernel-defaults.patch,targets.patch} package/feeds/luci/rpcd-mod-luci
+rm -rf devices/common/patches/{fix.patch,iptables.patch,kernel-defaults.patch,targets.patch}
 
 sed -i "s/PKG_SOURCE_DATE:=.*/PKG_SOURCE_DATE:=2099-12-06/" package/network/config/netifd/Makefile
 
@@ -14,7 +14,9 @@ sed -i "s/PKG_SOURCE_DATE:=.*/PKG_SOURCE_DATE:=2099-12-06/" package/network/conf
 #sed -i "/KernelPackage,multimedia-input/d" package/kernel/linux/modules/video.mk
 
 svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/toolchain/musl toolchain/musl
+svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/e2fsprogs package/utils/e2fsprogs
 svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/ucode package/utils/ucode
+svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/libs/libselinux package/libs/libselinux
 #ln -sf $(pwd)/feeds/luci/modules/luci-base package/feeds/kiddin9/
 
 sed -i "s/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += luci-app-mtk mii_mgr wifi-profile mtkhqos_util wireless-regdb switch regs kmod-warp kmod-mt_wifi kmod-mediatek_hnat kmod-conninfra datconf-lua/" target/linux/mediatek/Makefile

+ 153 - 0
devices/mediatek_mt7986/.config

@@ -0,0 +1,153 @@
+CONFIG_TARGET_mediatek=y
+CONFIG_TARGET_mediatek_mt7986=y
+CONFIG_TARGET_MULTI_PROFILE=y
+CONFIG_TARGET_DEVICE_mediatek_mt7986_DEVICE_mt7986a-ax6000-emmc-re-cp-03=y
+
+CONFIG_VERSION_DIST="OpenWrt"
+CONFIG_PACKAGE_kmod-ax25=n
+CONFIG_PACKAGE_kmod-mpls=n
+CONFIG_PACKAGE_kmod-netem=n
+CONFIG_PACKAGE_kmod-sched=n
+CONFIG_PACKAGE_kmod-sched-act-vlan=n
+CONFIG_PACKAGE_kmod-sched-bpf=n
+CONFIG_PACKAGE_kmod-sched-cake=n
+CONFIG_PACKAGE_kmod-sched-connmark=n
+CONFIG_PACKAGE_kmod-sched-core=n
+CONFIG_PACKAGE_kmod-sched-ctinfo=n
+CONFIG_PACKAGE_kmod-sched-flower=n
+CONFIG_PACKAGE_kmod-sched-ipset=n
+CONFIG_PACKAGE_kmod-sched-mqprio=n
+
+CONFIG_PACKAGE_kmod-i40e-vendor=n
+
+CONFIG_DEVEL=y
+CONFIG_TOOLCHAINOPTS=y
+CONFIG_BUSYBOX_CUSTOM=y
+CONFIG_AFALG_UPDATE_CTR_IV=y
+CONFIG_BUSYBOX_CONFIG_BLKID=y
+CONFIG_BUSYBOX_CONFIG_FEATURE_BLKID_TYPE=y
+CONFIG_BUSYBOX_CONFIG_VOLUMEID=y
+CONFIG_CONNINFRA_AUTO_UP=y
+CONFIG_CONNINFRA_EMI_SUPPORT=y
+# CONFIG_GDB is not set
+# CONFIG_KERNEL_BLK_DEV_THROTTLING is not set
+# CONFIG_KERNEL_CFS_BANDWIDTH is not set
+CONFIG_KERNEL_CGROUP_DEVICE=y
+CONFIG_KERNEL_CGROUP_FREEZER=y
+CONFIG_KERNEL_DEVMEM=y
+# CONFIG_KERNEL_KEYS is not set
+# CONFIG_KERNEL_MEMCG_SWAP is not set
+CONFIG_KERNEL_NET_CLS_CGROUP=y
+CONFIG_MTK_ACK_CTS_TIMEOUT_SUPPORT=y
+CONFIG_MTK_AIR_MONITOR=y
+CONFIG_MTK_AMPDU_CONF_SUPPORT=y
+CONFIG_MTK_ANTENNA_CONTROL_SUPPORT=y
+CONFIG_MTK_APCLI_SUPPORT=y
+CONFIG_MTK_ATE_SUPPORT=y
+CONFIG_MTK_BACKGROUND_SCAN_SUPPORT=y
+CONFIG_MTK_CAL_BIN_FILE_SUPPORT=y
+CONFIG_MTK_CFG_SUPPORT_FALCON_MURU=y
+CONFIG_MTK_CFG_SUPPORT_FALCON_PP=y
+CONFIG_MTK_CFG_SUPPORT_FALCON_SR=y
+CONFIG_MTK_CFG_SUPPORT_FALCON_TXCMD_DBG=y
+CONFIG_MTK_CHIP_MT7986=y
+CONFIG_MTK_CONNINFRA_APSOC=y
+CONFIG_MTK_CONNINFRA_APSOC_MT7986=y
+CONFIG_MTK_CON_WPS_SUPPORT=y
+CONFIG_MTK_DBDC_MODE=y
+CONFIG_MTK_DOT11K_RRM_SUPPORT=y
+CONFIG_MTK_DOT11R_FT_SUPPORT=y
+CONFIG_MTK_DOT11W_PMF_SUPPORT=y
+CONFIG_MTK_DOT11_HE_AX=y
+CONFIG_MTK_DOT11_N_SUPPORT=y
+CONFIG_MTK_DOT11_VHT_AC=y
+CONFIG_MTK_FAST_NAT_SUPPORT=y
+CONFIG_MTK_FIRST_IF_EEPROM_FLASH=y
+CONFIG_MTK_FIRST_IF_IPAILNA=y
+CONFIG_MTK_FIRST_IF_MT7986=y
+CONFIG_MTK_GREENAP_SUPPORT=y
+CONFIG_MTK_G_BAND_256QAM_SUPPORT=y
+CONFIG_MTK_HDR_TRANS_RX_SUPPORT=y
+CONFIG_MTK_HDR_TRANS_TX_SUPPORT=y
+CONFIG_MTK_ICAP_SUPPORT=y
+CONFIG_MTK_IGMP_SNOOP_SUPPORT=y
+CONFIG_MTK_INTERWORKING=y
+CONFIG_MTK_MAP_R2_VER_SUPPORT=y
+CONFIG_MTK_MAP_R3_VER_SUPPORT=y
+CONFIG_MTK_MAP_SUPPORT=y
+CONFIG_MTK_MBSS_DTIM_SUPPORT=y
+CONFIG_MTK_MBSS_SUPPORT=y
+CONFIG_MTK_MCAST_RATE_SPECIFIC=y
+CONFIG_MTK_MGMT_TXPWR_CTRL=y
+CONFIG_MTK_MLME_MULTI_QUEUE_SUPPORT=y
+CONFIG_MTK_MT_AP_SUPPORT=m
+CONFIG_MTK_MT_DFS_SUPPORT=y
+CONFIG_MTK_MT_MAC=y
+CONFIG_MTK_MT_WIFI=m
+CONFIG_MTK_MT_WIFI_PATH="mt_wifi"
+CONFIG_MTK_MUMIMO_SUPPORT=y
+CONFIG_MTK_MU_RA_SUPPORT=y
+CONFIG_MTK_OFFCHANNEL_SCAN_FEATURE=y
+CONFIG_MTK_OWE_SUPPORT=y
+CONFIG_MTK_PHY_ICS_SUPPORT=y
+CONFIG_MTK_QOS_R1_SUPPORT=y
+CONFIG_MTK_RA_PHY_RATE_SUPPORT=y
+CONFIG_MTK_RED_SUPPORT=y
+CONFIG_MTK_RTMP_FLASH_SUPPORT=y
+CONFIG_MTK_RT_FIRST_CARD_EEPROM="flash"
+CONFIG_MTK_RT_FIRST_IF_RF_OFFSET=0xc0000
+CONFIG_MTK_SCS_FW_OFFLOAD=y
+CONFIG_MTK_SECOND_IF_NONE=y
+CONFIG_MTK_SMART_CARRIER_SENSE_SUPPORT=y
+CONFIG_MTK_SPECTRUM_SUPPORT=y
+CONFIG_MTK_SUPPORT_OPENWRT=y
+CONFIG_MTK_THERMAL_PROTECT_SUPPORT=y
+CONFIG_MTK_THIRD_IF_NONE=y
+CONFIG_MTK_TPC_SUPPORT=y
+CONFIG_MTK_TXBF_SUPPORT=y
+CONFIG_MTK_UAPSD=y
+CONFIG_MTK_VLAN_SUPPORT=y
+CONFIG_MTK_VOW_SUPPORT=y
+CONFIG_MTK_WARP_V2=y
+CONFIG_MTK_WDS_SUPPORT=y
+CONFIG_MTK_WHNAT_SUPPORT=m
+CONFIG_MTK_WIFI_ADIE_TYPE="mt7976"
+CONFIG_MTK_WIFI_BASIC_FUNC=y
+CONFIG_MTK_WIFI_DRIVER=y
+CONFIG_MTK_WIFI_EAP_FEATURE=y
+CONFIG_MTK_WIFI_FW_BIN_LOAD=y
+CONFIG_MTK_WIFI_MODE_AP=m
+CONFIG_MTK_WIFI_MT_MAC=y
+CONFIG_MTK_WIFI_SKU_TYPE="AX6000"
+CONFIG_MTK_WIFI_TWT_SUPPORT=y
+CONFIG_MTK_WLAN_HOOK=y
+CONFIG_MTK_WLAN_SERVICE=y
+CONFIG_MTK_WNM_SUPPORT=y
+CONFIG_MTK_WPA3_SUPPORT=y
+CONFIG_MTK_WSC_INCLUDED=y
+CONFIG_MTK_WSC_V2_SUPPORT=y
+
+# CONFIG_PKG_CHECK_FORMAT_SECURITY is not set
+# CONFIG_PKG_FORTIFY_SOURCE_1 is not set
+CONFIG_PKG_FORTIFY_SOURCE_2=y
+CONFIG_WARP_CHIPSET="mt7986"
+CONFIG_WARP_DBG_SUPPORT=y
+CONFIG_WARP_MEMORY_LEAK_DBG=y
+CONFIG_WARP_VERSION=2
+CONFIG_WED_HW_RRO_SUPPORT=y
+CONFIG_WIFI_NORMAL_SETTING=y
+# CONFIG_WOLFSSL_HAS_ECC25519 is not set
+CONFIG_first_card=y
+CONFIG_first_card_name="MT7986"
+# CONFIG_AFALG_FALLBACK is not set
+# CONFIG_MTK_BAND_STEERING is not set
+# CONFIG_MTK_DEFAULT_5G_PROFILE is not set
+# CONFIG_MTK_MAC_REPEATER_SUPPORT is not set
+# CONFIG_MTK_MULTI_PROFILE_SUPPORT is not set
+# CONFIG_MTK_PCIE_ASPM_DYM_CTRL_SUPPORT is not set
+# CONFIG_MTK_PRE_CAL_TRX_SET1_SUPPORT is not set
+# CONFIG_MTK_PRE_CAL_TRX_SET2_SUPPORT is not set
+# CONFIG_MTK_RLM_CAL_CACHE_SUPPORT is not set
+# CONFIG_MTK_SNIFFER_RADIOTAP_SUPPORT is not set
+
+CONFIG_PACKAGE_luci-ssl=y # uhttpd服务

+ 1 - 0
devices/mediatek_mt7986/README.md

@@ -0,0 +1 @@
+源码来源 https://github.com/hanwckf/immortalwrt-mt798x 感谢

+ 22 - 0
devices/mediatek_mt7986/diy.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+shopt -s extglob
+
+SHELL_FOLDER=$(dirname $(readlink -f "$0"))
+
+rm -rf feeds/kiddin9/{rtl*,shortcut-fe,fullconenat-nft} package/feeds/luci/rpcd-mod-luci toolchain/musl package/feeds/packages/gptfdisk package/utils/f2fs-tools package/utils/e2fsprogs package/libs/libselinux package/feeds/packages/acl
+
+rm -rf devices/common/patches/{fix.patch,iptables.patch,kernel-defaults.patch,targets.patch}
+
+sed -i "s/PKG_SOURCE_DATE:=.*/PKG_SOURCE_DATE:=2099-12-06/" package/network/config/netifd/Makefile
+
+#sed -i "/KernelPackage,sound-soc-core/d" package/kernel/linux/modules/sound.mk
+#sed -i "/KernelPackage,multimedia-input/d" package/kernel/linux/modules/video.mk
+
+svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/toolchain/musl toolchain/musl
+svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/e2fsprogs package/utils/e2fsprogs
+svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/utils/ucode package/utils/ucode
+svn co https://github.com/openwrt/openwrt/branches/openwrt-23.05/package/libs/libselinux package/libs/libselinux
+#ln -sf $(pwd)/feeds/luci/modules/luci-base package/feeds/kiddin9/
+
+sed -i "s/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += luci-app-mtk mii_mgr wifi-profile mkf2fs mtkhqos_util wireless-regdb switch regs kmod-warp kmod-mt_wifi kmod-mediatek_hnat kmod-conninfra datconf-lua mmc-utils/" target/linux/mediatek/Makefile

+ 4 - 0
devices/mediatek_mt7986/feeds.conf

@@ -0,0 +1,4 @@
+src-git-full packages https://github.com/immortalwrt/packages.git;openwrt-21.02
+src-git luci https://github.com/openwrt/luci.git;openwrt-23.05
+src-git-full routing https://github.com/openwrt/routing.git;openwrt-21.02
+src-git kiddin9 https://github.com/kiddin9/openwrt-packages.git;master

+ 22 - 0
devices/mediatek_mt7986/patches/base-files.patch

@@ -0,0 +1,22 @@
+--- a/package/feeds/kiddin9/base-files/Makefile
++++ b/package/feeds/kiddin9/base-files/Makefile
+@@ -205,6 +205,9 @@ define Package/base-files/install
+ 
+ 	$(if $(CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE), \
+ 		rm -f $(1)/etc/banner.failsafe,)
++
++	$(if $(CONFIG_PACKAGE_wifi-profile), \
++		rm -f $(1)/sbin/wifi)
+ endef
+ 
+ ifneq ($(DUMP),1)
+
+--- a/package/feeds/kiddin9/base-files/files/etc/hotplug.d/net/00-sysctl
++++ b/package/feeds/kiddin9/base-files/files/etc/hotplug.d/net/00-sysctl
+@@ -6,4 +6,6 @@ if [ "$ACTION" = add ]; then
+ 		sed -ne "/^[[:space:]]*net\..*\.$DEVICENAME\./p" "$CONF" | \
+ 			sysctl -e -p - | logger -t sysctl
+ 	done
++
++	[ -f /sbin/smp.sh ] && /sbin/smp.sh
+ fi

+ 67 - 0
devices/mediatek_mt7986/patches/fix.patch

@@ -0,0 +1,67 @@
+--- a/include/image.mk
++++ b/include/image.mk
+@@ -609,6 +609,7 @@ define Device/Build/image
+ 	IMAGE_TYPE=$(word 1,$(subst ., ,$(2))) \
+ 	IMAGE_FILESYSTEM="$(1)" \
+ 	IMAGE_PREFIX="$(IMAGE_PREFIX)" \
++	KERNEL_INITRAMFS_IMAGE="$(subst $(IMG_PREFIX_EXTRA),,$(KERNEL_INITRAMFS_IMAGE))" \
+ 	DEVICE_VENDOR="$(DEVICE_VENDOR)" \
+ 	DEVICE_MODEL="$(DEVICE_MODEL)" \
+ 	DEVICE_VARIANT="$(DEVICE_VARIANT)" \
+
+--- a/scripts/json_add_image_info.py
++++ b/scripts/json_add_image_info.py
+@@ -48,6 +48,7 @@ def get_titles():
+     "profiles": {
+         device_id: {
+             "image_prefix": getenv("IMAGE_PREFIX"),
++            "image_initramfs": getenv("KERNEL_INITRAMFS_IMAGE"),
+             "images": [
+                 {
+                     "type": getenv("IMAGE_TYPE"),
+
+--- a/scripts/json_overview_image_info.py
++++ b/scripts/json_overview_image_info.py
+@@ -47,7 +47,7 @@ def get_initial_output(image_info):
+ 
+ 
+ if output:
+-    default_packages, output["arch_packages"] = run(
++    default_packages, output["arch_packages"], output["kernel_version"] = run(
+         [
+             "make",
+             "--no-print-directory",
+@@ -55,6 +55,7 @@ def get_initial_output(image_info):
+             "target/linux/",
+             "val.DEFAULT_PACKAGES",
+             "val.ARCH_PACKAGES",
++            "val.LINUX_VERSION",
+         ],
+         stdout=PIPE,
+         stderr=PIPE,
+
+--- a/package/mtk/applications/luci-app-mtk/luasrc/view/admin_mtk/mtk_wifi_vif_cfg.htm
++++ b/package/mtk/applications/luci-app-mtk/luasrc/view/admin_mtk/mtk_wifi_vif_cfg.htm
+@@ -581,9 +581,7 @@ <h2><%:Interface Configurations%> - <%=vifname and devname.."@"..vifname or devn
+         </table>
+         <h3><%:Access control MAC address list%></h3>
+         <textarea name="__maclist" id="__maclist" style="width:98%; height: 100px;"><%
+-        local list = cfgs["AccessControlList"..(vifidx-1)] or ""
+-        print(table.concat(list:split(";"), "\n"))
+-        %></textarea>
++        local list = cfgs["AccessControlList"..(vifidx-1)] or "" %><%=table.concat(list:split(";"), "\n")%></textarea>
+         </fieldset>
+ 
+         <% if string.split(cfgs.WirelessMode,";")[1] == "16" or string.split(cfgs.WirelessMode,";")[1] == "17" or string.split(cfgs.WirelessMode,";")[1] == "18" then %>
+
+--- a/target/linux/mediatek/image/mt7986.mk
++++ b/target/linux/mediatek/image/mt7986.mk
+@@ -62,7 +62,7 @@ TARGET_DEVICES += mt7986a-ax6000-snfi-nand-rfb
+ 
+ define Device/mt7986a-ax6000-emmc-re-cp-03
+   DEVICE_VENDOR := JDCloud
+-  DEVICE_MODEL := JDCloud MT7986a RE-CP-03
++  DEVICE_MODEL := AX6000 Baili(RE-CP-03)
+   DEVICE_TITLE := JDCloud AX6000 Baili(RE-CP-03)
+   DEVICE_DTS := mt7986a-emmc-re-cp-03
+   DEVICE_DTS_DIR := $(DTS_DIR)/mediatek

+ 40 - 0
devices/mediatek_mt7986/patches/iptables-mod-socket.patch

@@ -0,0 +1,40 @@
+--- a/package/network/utils/iptables/Makefile
++++ b/package/network/utils/iptables/Makefile
+@@ -388,6 +388,19 @@ iptables extension for triggering a LED.
+ 
+ endef
+ 
++define Package/iptables-mod-socket
++$(call Package/iptables/Module, +kmod-ipt-socket)
++  TITLE:=Socket match iptables extensions
++endef
++
++define Package/iptables-mod-socket/description
++Socket match iptables extensions.
++
++ Matches:
++  - socket
++
++endef
++
+ define Package/iptables-mod-tproxy
+ $(call Package/iptables/Module, +kmod-ipt-tproxy)
+   TITLE:=Transparent proxy iptables extensions
+@@ -396,9 +409,6 @@ endef
+ define Package/iptables-mod-tproxy/description
+ Transparent proxy iptables extensions.
+ 
+- Matches:
+-  - socket
+-
+  Targets:
+   - TPROXY
+ 
+@@ -721,6 +731,7 @@ $(eval $(call BuildPlugin,iptables-mod-ulog,$(IPT_ULOG-m)))
+ $(eval $(call BuildPlugin,iptables-mod-hashlimit,$(IPT_HASHLIMIT-m)))
+ $(eval $(call BuildPlugin,iptables-mod-rpfilter,$(IPT_RPFILTER-m)))
+ $(eval $(call BuildPlugin,iptables-mod-led,$(IPT_LED-m)))
++$(eval $(call BuildPlugin,iptables-mod-socket,$(IPT_SOCKET-m)))
+ $(eval $(call BuildPlugin,iptables-mod-tproxy,$(IPT_TPROXY-m)))
+ $(eval $(call BuildPlugin,iptables-mod-tee,$(IPT_TEE-m)))
+ $(eval $(call BuildPlugin,iptables-mod-u32,$(IPT_U32-m)))

+ 10 - 0
devices/mediatek_mt7986/patches/kernel-defaults.patch

@@ -0,0 +1,10 @@
+--- a/include/kernel-defaults.mk
++++ b/include/kernel-defaults.mk
+@@ -115,6 +115,7 @@ endef
+ 
+ define Kernel/CompileModules/Default
+ 	rm -f $(LINUX_DIR)/vmlinux $(LINUX_DIR)/System.map
++	+$(KERNEL_MAKE) olddefconfig
+ 	+$(KERNEL_MAKE) modules
+ endef
+ 

+ 44 - 0
devices/mediatek_mt7986/patches/targets.patch

@@ -0,0 +1,44 @@
+--- a/include/target.mk
++++ b/include/target.mk
+@@ -46,27 +46,27 @@ DEFAULT_PACKAGES.router:=\
+ 	dnsmasq-full \
+ 	firewall \
+ 	iptables \
+-	ipv6helper \
++	ip6tables \
++	kmod-ipt-nat \
++	kmod-ipt-nat6 \
++	kmod-ipt-offload \
++	odhcp6c \
++	odhcpd-ipv6only \
+ 	ppp \
+ 	ppp-mod-pppoe
+-# For easy usage
+-DEFAULT_PACKAGES.tweak:=\
+-	block-mount \
+-	default-settings-chn \
+-	kmod-ipt-raw \
+-	kmod-nf-nathelper \
+-	kmod-nf-nathelper-extra \
+-	luci \
+-	luci-app-filetransfer \
+-	luci-compat \
+-	luci-lib-base \
+-	luci-lib-fs \
+-	luci-lib-ipkg
+ 
+ ifneq ($(DUMP),)
+   all: dumpinfo
+ endif
+ 
++ifeq ($(ARCH),arm)
++  DEFAULT_PACKAGES+=luci-app-cpufreq
++endif
++
++ifeq ($(ARCH),aarch64)
++  DEFAULT_PACKAGES+=luci-app-cpufreq
++endif
++
+ target_conf=$(subst .,_,$(subst -,_,$(subst /,_,$(1))))
+ ifeq ($(DUMP),)
+   PLATFORM_DIR:=$(TOPDIR)/target/linux/$(BOARD)

+ 2 - 0
devices/mediatek_mt7986/settings.ini

@@ -0,0 +1,2 @@
+REPO_URL="https://github.com/lgs2007m/immortalwrt-mt798x"
+REPO_BRANCH="openwrt-21.02"