diff --git a/patches-24.10/0061-target-add-fw3-default-packages-variant.patch b/patches-24.10/0061-target-add-fw3-default-packages-variant.patch new file mode 100644 index 000000000..74962fe29 --- /dev/null +++ b/patches-24.10/0061-target-add-fw3-default-packages-variant.patch @@ -0,0 +1,40 @@ +From c239d623d50a5e603427923b77d1e3ddcb4b5ab8 Mon Sep 17 00:00:00 2001 +From: John Crispin +Date: Thu, 2 Oct 2025 07:45:46 +0200 +Subject: [PATCH] target: add fw3 default packages variant + +Add a new DEFAULT_PACKAGES.fw3 variant that uses firewall3 instead of +firewall4. This is needed for the mediatek-sdk kernel which is based on +kernel 5.4.271 and requires firewall3 compatibility. + +Signed-off-by: John Crispin +--- + include/target.mk | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/include/target.mk b/include/target.mk +index 637ef2077e..d830105106 100644 +--- a/include/target.mk ++++ b/include/target.mk +@@ -71,6 +71,18 @@ DEFAULT_PACKAGES.qsdk:=\ + ppp-mod-pppoe \ + -procd-ujail + ++DEFAULT_PACKAGES.fw3:=\ ++ dnsmasq \ ++ firewall \ ++ ip6tables \ ++ iptables \ ++ kmod-ipt-offload \ ++ odhcp6c \ ++ odhcpd-ipv6only \ ++ ppp \ ++ ppp-mod-pppoe ++ ++ + ifneq ($(DUMP),) + all: dumpinfo + endif +-- +2.34.1 + diff --git a/patches/0067-mediatek-sdk-build-tree-hacks.patch b/patches/0067-mediatek-sdk-build-tree-hacks.patch deleted file mode 100644 index ad16b3627..000000000 --- a/patches/0067-mediatek-sdk-build-tree-hacks.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 055af3cc5627530a564b5d85fb0edd14107af564 Mon Sep 17 00:00:00 2001 -From: John Crispin -Date: Fri, 8 Mar 2024 09:34:02 +0100 -Subject: [PATCH 67/68] mediatek-sdk: build tree hacks - -Signed-off-by: John Crispin ---- - package/kernel/linux/modules/crypto.mk | 2 +- - package/network/config/firewall4/Makefile | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk -index 53dcd24444..0d6f1e10b3 100644 ---- a/package/kernel/linux/modules/crypto.mk -+++ b/package/kernel/linux/modules/crypto.mk -@@ -42,7 +42,7 @@ define KernelPackage/crypto-aead - CONFIG_CRYPTO_AEAD2 - FILES:= \ - $(LINUX_DIR)/crypto/aead.ko \ -- $(LINUX_DIR)/crypto/geniv.ko -+ $(LINUX_DIR)/crypto/geniv.ko@gt5.4 - AUTOLOAD:=$(call AutoLoad,09,aead,1) - $(call AddDepends/crypto, +kmod-crypto-null) - endef -diff --git a/package/network/config/firewall4/Makefile b/package/network/config/firewall4/Makefile -index 809f3d3f04..a3be65d8ac 100644 ---- a/package/network/config/firewall4/Makefile -+++ b/package/network/config/firewall4/Makefile -@@ -22,7 +22,7 @@ define Package/firewall4 - CATEGORY:=Base system - TITLE:=OpenWrt 4th gen firewall - DEPENDS:= \ -- +kmod-nft-core +kmod-nft-fib +kmod-nft-offload \ -+ +kmod-nft-core +kmod-nft-fib +!TARGET_mediatek:kmod-nft-offload \ - +kmod-nft-nat \ - +nftables-json \ - +ucode +ucode-mod-fs +ucode-mod-ubus +ucode-mod-uci --- -2.34.1 - diff --git a/patches/0069-mediatek-build-tree-integration.patch b/patches/0069-mediatek-build-tree-integration.patch deleted file mode 100644 index 1d771aa79..000000000 --- a/patches/0069-mediatek-build-tree-integration.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 52b5e226b69e67036bc23ed9dda3de12f95637ac Mon Sep 17 00:00:00 2001 -From: John Crispin -Date: Mon, 29 Apr 2024 11:18:00 +0200 -Subject: [PATCH] mediatek: build tree integration - -Signed-off-by: John Crispin ---- - include/target.mk | 11 +++++++++++ - package/kernel/linux/modules/netsupport.mk | 2 +- - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/include/target.mk b/include/target.mk -index 38578f60c4..3a17587e4e 100644 ---- a/include/target.mk -+++ b/include/target.mk -@@ -74,6 +74,17 @@ DEFAULT_PACKAGES.qsdk:=\ - ppp-mod-pppoe \ - -procd-ujail - -+DEFAULT_PACKAGES.fw3:=\ -+ dnsmasq \ -+ firewall \ -+ ip6tables \ -+ iptables \ -+ kmod-ipt-offload \ -+ odhcp6c \ -+ odhcpd-ipv6only \ -+ ppp \ -+ ppp-mod-pppoe -+ - ifneq ($(DUMP),) - all: dumpinfo - endif -diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk -index d6b28c51b7..eccb043b27 100644 ---- a/package/kernel/linux/modules/netsupport.mk -+++ b/package/kernel/linux/modules/netsupport.mk -@@ -994,7 +994,7 @@ endef - $(eval $(call KernelPackage,bpf-test)) - - --SCHED_MODULES_EXTRA = sch_codel sch_dsmark sch_gred sch_multiq sch_sfq sch_teql sch_fq act_pedit act_simple act_csum em_cmp em_nbyte em_meta em_text -+SCHED_MODULES_EXTRA = sch_codel sch_dsmark@gt5.4 sch_gred sch_multiq sch_sfq sch_teql sch_fq act_pedit act_simple act_csum em_cmp em_nbyte em_meta em_text - SCHED_FILES_EXTRA = $(foreach mod,$(SCHED_MODULES_EXTRA),$(LINUX_DIR)/net/sched/$(mod).ko) - - define KernelPackage/sched --- -2.34.1 -