From c23bc293ef999649d5e8a3bf75f1fbd290d8c55a Mon Sep 17 00:00:00 2001 From: Matthias Schiffer <mschiffer@universe-factory.net> Date: Sun, 11 Jul 2021 22:45:47 +0200 Subject: [PATCH] treewide: remove GLUON_SPECIALIZE_KERNEL With the removal of ramips-rt305x, the last user of GLUON_SPECIALIZE_KERNEL is gone. --- package/gluon-client-bridge/Makefile | 2 +- package/gluon-core/Config.in | 360 ------------------- package/gluon-core/Makefile | 4 +- package/gluon-ebtables-limit-arp/Makefile | 5 +- package/gluon-ebtables/Makefile | 11 +- package/gluon-mesh-batman-adv/Makefile | 5 +- package/gluon-mesh-vpn-core/Makefile | 10 +- package/gluon-mesh-vpn-fastd/Makefile | 2 +- package/gluon-mesh-vpn-tunneldigger/Makefile | 2 +- 9 files changed, 10 insertions(+), 391 deletions(-) delete mode 100644 package/gluon-core/Config.in diff --git a/package/gluon-client-bridge/Makefile b/package/gluon-client-bridge/Makefile index a2daf34b4..e65e4eeff 100644 --- a/package/gluon-client-bridge/Makefile +++ b/package/gluon-client-bridge/Makefile @@ -7,7 +7,7 @@ include ../gluon.mk define Package/gluon-client-bridge TITLE:=Provides a bridge and a wireless interface for clients to connect to - DEPENDS:=+gluon-core +kmod-veth +@GLUON_SPECIALIZE_KERNEL:KERNEL_VETH + DEPENDS:=+gluon-core +kmod-veth endef $(eval $(call BuildPackageGluon,gluon-client-bridge)) diff --git a/package/gluon-core/Config.in b/package/gluon-core/Config.in deleted file mode 100644 index 6550ec7ec..000000000 --- a/package/gluon-core/Config.in +++ /dev/null @@ -1,360 +0,0 @@ -config KERNEL_NET_IP_TUNNEL - bool - -config KERNEL_NET_UDP_TUNNEL - bool - -config KERNEL_VXLAN - bool - select KERNEL_NET_IP_TUNNEL - select KERNEL_NET_UDP_TUNNEL - -config KERNEL_VETH - bool - - -# for fastd - -config KERNEL_TUN - bool - - -# for tunneldigger - -config KERNEL_L2TP_V3 - bool - -config KERNEL_L2TP_ETH - bool - -config KERNEL_L2TP - bool - select KERNEL_L2TP_V3 - select KERNEL_L2TP_ETH - - -# for simple-tc - -config KERNEL_NET_SCHED - bool - -config KERNEL_NET_CLS - bool - select KERNEL_NET_SCHED - -config KERNEL_NET_CLS_ACT - bool - select KERNEL_NET_CLS - -config KERNEL_NET_ACT_POLICE - bool - select KERNEL_NET_CLS_ACT - -config KERNEL_NET_CLS_BASIC - bool - select KERNEL_NET_CLS - -config KERNEL_NET_SCH_TBF - bool - select KERNEL_NET_SCHED - -config KERNEL_NET_SCH_INGRESS - bool - select KERNEL_NET_CLS_ACT - - -# for batman-adv - -config KERNEL_DUMMY - bool - -config KERNEL_CRC16 - bool - -config KERNEL_LIBCRC32C - bool - - -# Netfilter modules used by ebtables and fw3 - -config KERNEL_NETFILTER - bool - -config KERNEL_NETFILTER_ADVANCED - bool - select KERNEL_NETFILTER - -config KERNEL_NETFILTER_XTABLES - bool - select KERNEL_NETFILTER_ADVANCED - -config KERNEL_BRIDGE_NF_EBTABLES - bool - select KERNEL_NETFILTER_XTABLES - -config KERNEL_BRIDGE_EBT_T_FILTER - bool - select KERNEL_BRIDGE_NF_EBTABLES - -config KERNEL_BRIDGE_EBT_T_NAT - bool - select KERNEL_BRIDGE_NF_EBTABLES - -config KERNEL_BRIDGE_EBT_ARP - bool - select KERNEL_BRIDGE_NF_EBTABLES - -config KERNEL_BRIDGE_EBT_DNAT - bool - select KERNEL_BRIDGE_NF_EBTABLES - -config KERNEL_BRIDGE_EBT_IP - bool - select KERNEL_BRIDGE_NF_EBTABLES - -config KERNEL_BRIDGE_EBT_IP6 - bool - select KERNEL_BRIDGE_NF_EBTABLES - -config KERNEL_BRIDGE_EBT_LIMIT - bool - select KERNEL_BRIDGE_NF_EBTABLES - -config KERNEL_BRIDGE_EBT_MARK - bool - select KERNEL_BRIDGE_NF_EBTABLES - -config KERNEL_BRIDGE_EBT_MARK_T - bool - select KERNEL_BRIDGE_NF_EBTABLES - -config KERNEL_BRIDGE_EBT_REDIRECT - bool - select KERNEL_BRIDGE_NF_EBTABLES - -# Not all of the following modules are really required for Gluon, but fw3 pulls -# them in, so we add them to the kernel config to reduce the number of loaded -# modules - -# kmod-nf-conntrack - -config KERNEL_NF_CONNTRACK - bool - select KERNEL_NETFILTER_ADVANCED - -config KERNEL_NF_CONNTRACK_RTCACHE - bool - select KERNEL_NF_CONNTRACK - -config KERNEL_NF_CONNTRACK_IPV4 - bool - select KERNEL_NF_CONNTRACK - - -# kmod-nf-conntrack6 - -config KERNEL_NF_CONNTRACK_IPV6 - bool - select KERNEL_NF_CONNTRACK - - -# kmod-nf-ipt - -config KERNEL_NF_REJECT_IPV4 - bool - select KERNEL_NETFILTER_ADVANCED - -config KERNEL_IP_NF_IPTABLES - bool - select KERNEL_NETFILTER_XTABLES - select KERNEL_NF_REJECT_IPV4 - - -# kmod-nf-ipt6 - -config KERNEL_NF_REJECT_IPV6 - bool - select KERNEL_NETFILTER_ADVANCED - -config KERNEL_IP6_NF_IPTABLES - bool - select KERNEL_NETFILTER_XTABLES - select KERNEL_NF_REJECT_IPV6 - - -# kmod-nf-nat - -config KERNEL_NF_NAT - bool - select KERNEL_NF_CONNTRACK - -config KERNEL_NF_NAT_REDIRECT - bool - select KERNEL_NF_NAT - -config KERNEL_NF_NAT_IPV4 - bool - select KERNEL_NETFILTER_ADVANCED - select KERNEL_NF_NAT - -config KERNEL_NF_NAT_MASQUERADE_IPV4 - bool - select KERNEL_NF_NAT_IPV4 - - -# kmod-ipt-core - -config KERNEL_IP_NF_FILTER - bool - select KERNEL_IP_NF_IPTABLES - -config KERNEL_IP_NF_MANGLE - bool - select KERNEL_IP_NF_IPTABLES - -config KERNEL_IP_NF_TARGET_REJECT - bool - select KERNEL_IP_NF_FILTER - -config KERNEL_NETFILTER_XT_MATCH_LIMIT - bool - select KERNEL_NETFILTER_XTABLES - -config KERNEL_NETFILTER_XT_MATCH_MAC - bool - select KERNEL_NETFILTER_XTABLES - -config KERNEL_NETFILTER_XT_MATCH_MULTIPORT - bool - select KERNEL_NETFILTER_XTABLES - -config KERNEL_NETFILTER_XT_MATCH_COMMENT - bool - select KERNEL_NETFILTER_XTABLES - -config KERNEL_NETFILTER_XT_MATCH_TIME - bool - select KERNEL_NETFILTER_XTABLES - -config KERNEL_NETFILTER_XT_MARK - bool - select KERNEL_NETFILTER_XTABLES - -config KERNEL_NETFILTER_XT_TARGET_LOG - bool - select KERNEL_NETFILTER_XTABLES - -config KERNEL_NETFILTER_XT_TARGET_TCPMSS - bool - select KERNEL_NETFILTER_XTABLES - -# kmod-ip6tables - -config KERNEL_IP6_NF_FILTER - bool - select KERNEL_IP6_NF_IPTABLES - -config KERNEL_IP6_NF_MANGLE - bool - select KERNEL_IP6_NF_IPTABLES - -config KERNEL_IP6_NF_TARGET_REJECT - bool - select KERNEL_IP6_NF_IPTABLES - - -# kmod-ipt-conntrack - -config KERNEL_NETFILTER_XT_MATCH_STATE - bool - select KERNEL_NETFILTER_XTABLES - select KERNEL_NF_CONNTRACK - -config KERNEL_NETFILTER_XT_MATCH_CONNTRACK - bool - select KERNEL_NETFILTER_XTABLES - select KERNEL_NF_CONNTRACK - -config KERNEL_IP_NF_RAW - bool - select KERNEL_IP_NF_IPTABLES - -config KERNEL_NETFILTER_XT_TARGET_CT - bool - select KERNEL_NETFILTER_XTABLES - select KERNEL_NF_CONNTRACK - select KERNEL_IP_NF_RAW - - -# kmod-ipt-nat - -config KERNEL_IP_NF_NAT - bool - select KERNEL_NF_NAT - select KERNEL_IP_NF_IPTABLES - -config KERNEL_IP_NF_TARGET_MASQUERADE - bool - select KERNEL_NF_NAT_MASQUERADE_IPV4 - select KERNEL_IP_NF_NAT - -config KERNEL_IP_NF_TARGET_REDIRECT - bool - select KERNEL_NF_NAT - select KERNEL_IP_NF_NAT - - -# kmod-ipt-extra - -config KERNEL_NETFILTER_XT_MATCH_ADDRTYPE - bool - select KERNEL_NETFILTER_XTABLES - -config KERNEL_NETFILTER_XT_MATCH_OWNER - bool - select KERNEL_NETFILTER_XTABLES - -config KERNEL_NETFILTER_XT_MATCH_PKTTYPE - bool - select KERNEL_NETFILTER_XTABLES - -config KERNEL_NETFILTER_XT_MATCH_QUOTA - bool - select KERNEL_NETFILTER_XTABLES - - -config GLUON_SPECIALIZE_KERNEL - bool "Specialize kernel for Gluon" - select KERNEL_VXLAN - select KERNEL_NF_CONNTRACK_RTCACHE - select KERNEL_NF_CONNTRACK_IPV4 - select KERNEL_NF_CONNTRACK_IPV6 - select KERNEL_IP_NF_IPTABLES - select KERNEL_IP6_NF_IPTABLES - select KERNEL_NF_NAT_REDIRECT - select KERNEL_NF_NAT_IPV4 - select KERNEL_NF_NAT_MASQUERADE_IPV4 - select KERNEL_IP_NF_FILTER - select KERNEL_IP_NF_MANGLE - select KERNEL_IP_NF_TARGET_REJECT - select KERNEL_IP6_NF_FILTER - select KERNEL_IP6_NF_MANGLE - select KERNEL_IP6_NF_TARGET_REJECT - select KERNEL_NETFILTER_XT_MATCH_LIMIT - select KERNEL_NETFILTER_XT_MATCH_MAC - select KERNEL_NETFILTER_XT_MATCH_MULTIPORT - select KERNEL_NETFILTER_XT_MATCH_COMMENT - select KERNEL_NETFILTER_XT_MATCH_TIME - select KERNEL_NETFILTER_XT_MARK - select KERNEL_NETFILTER_XT_TARGET_LOG - select KERNEL_NETFILTER_XT_TARGET_TCPMSS - select KERNEL_NETFILTER_XT_MATCH_STATE - select KERNEL_NETFILTER_XT_MATCH_CONNTRACK - select KERNEL_NETFILTER_XT_TARGET_CT - select KERNEL_IP_NF_NAT - select KERNEL_IP_NF_TARGET_MASQUERADE - select KERNEL_IP_NF_TARGET_REDIRECT - -config GLUON_MINIFY - bool "Minify Gluon scripts" - default y diff --git a/package/gluon-core/Makefile b/package/gluon-core/Makefile index 37aaa3f2c..e8f695353 100644 --- a/package/gluon-core/Makefile +++ b/package/gluon-core/Makefile @@ -22,7 +22,9 @@ define Package/gluon-core/description endef define Package/gluon-core/config - source "$(SOURCE)/Config.in" +config GLUON_MINIFY + bool "Minify Gluon scripts" + default y endef define Package/gluon-core/install diff --git a/package/gluon-ebtables-limit-arp/Makefile b/package/gluon-ebtables-limit-arp/Makefile index f7bdc48d0..852900ef1 100644 --- a/package/gluon-ebtables-limit-arp/Makefile +++ b/package/gluon-ebtables-limit-arp/Makefile @@ -8,10 +8,7 @@ include ../gluon.mk define Package/gluon-ebtables-limit-arp TITLE:=Ebtables limiter for ARP packets - DEPENDS:=+gluon-core +gluon-ebtables gluon-mesh-batman-adv \ - +@GLUON_SPECIALIZE_KERNEL:KERNEL_BRIDGE_EBT_LIMIT \ - +@GLUON_SPECIALIZE_KERNEL:KERNEL_BRIDGE_EBT_MARK \ - +@GLUON_SPECIALIZE_KERNEL:KERNEL_BRIDGE_EBT_MARK_T + DEPENDS:=+gluon-core +gluon-ebtables gluon-mesh-batman-adv endef define Package/gluon-ebtables-limit-arp/description diff --git a/package/gluon-ebtables/Makefile b/package/gluon-ebtables/Makefile index ca83fcf48..e15cfe596 100644 --- a/package/gluon-ebtables/Makefile +++ b/package/gluon-ebtables/Makefile @@ -4,21 +4,12 @@ PKG_NAME:=gluon-ebtables PKG_VERSION:=1 PKG_RELEASE:=1 -PKG_CONFIG_DEPENDS := CONFIG_GLUON_SPECIALIZE_KERNEL - include ../gluon.mk define Package/gluon-ebtables TITLE:=Ebtables support DEPENDS:=+gluon-core +ebtables-tiny \ - +@GLUON_SPECIALIZE_KERNEL:KERNEL_BRIDGE_EBT_T_FILTER \ - +@GLUON_SPECIALIZE_KERNEL:KERNEL_BRIDGE_EBT_T_NAT \ - +@GLUON_SPECIALIZE_KERNEL:KERNEL_BRIDGE_EBT_ARP \ - +@GLUON_SPECIALIZE_KERNEL:KERNEL_BRIDGE_EBT_IP \ - +@GLUON_SPECIALIZE_KERNEL:KERNEL_BRIDGE_EBT_IP6 \ - +!GLUON_SPECIALIZE_KERNEL:kmod-ebtables \ - +!GLUON_SPECIALIZE_KERNEL:kmod-ebtables-ipv4 \ - +!GLUON_SPECIALIZE_KERNEL:kmod-ebtables-ipv6 + +kmod-ebtables +kmod-ebtables-ipv4 +kmod-ebtables-ipv6 endef define Package/gluon-ebtables/description diff --git a/package/gluon-mesh-batman-adv/Makefile b/package/gluon-mesh-batman-adv/Makefile index eac84ac5f..1d124584c 100644 --- a/package/gluon-mesh-batman-adv/Makefile +++ b/package/gluon-mesh-batman-adv/Makefile @@ -19,10 +19,7 @@ define Package/gluon-mesh-batman-adv-15 +kmod-dummy \ +libnl-tiny \ +libbatadv \ - +batctl \ - +@GLUON_SPECIALIZE_KERNEL:KERNEL_DUMMY \ - +@GLUON_SPECIALIZE_KERNEL:KERNEL_CRC16 \ - +@GLUON_SPECIALIZE_KERNEL:KERNEL_LIBCRC32C + +batctl endef $(eval $(call BuildPackageGluon,gluon-mesh-batman-adv-15)) diff --git a/package/gluon-mesh-vpn-core/Makefile b/package/gluon-mesh-vpn-core/Makefile index 1acf17ca3..4e4c23c4e 100644 --- a/package/gluon-mesh-vpn-core/Makefile +++ b/package/gluon-mesh-vpn-core/Makefile @@ -7,15 +7,7 @@ include ../gluon.mk define Package/gluon-mesh-vpn-core TITLE:=Basic support for connecting meshes via VPN tunnels - DEPENDS:=+gluon-core +gluon-wan-dnsmasq +iptables +iptables-mod-extra +simple-tc \ - +@GLUON_SPECIALIZE_KERNEL:KERNEL_NETFILTER_XT_MATCH_ADDRTYPE \ - +@GLUON_SPECIALIZE_KERNEL:KERNEL_NETFILTER_XT_MATCH_OWNER \ - +@GLUON_SPECIALIZE_KERNEL:KERNEL_NETFILTER_XT_MATCH_PKTTYPE \ - +@GLUON_SPECIALIZE_KERNEL:KERNEL_NETFILTER_XT_MATCH_QUOTA \ - +@GLUON_SPECIALIZE_KERNEL:KERNEL_NET_CLS_BASIC \ - +@GLUON_SPECIALIZE_KERNEL:KERNEL_NET_ACT_POLICE \ - +@GLUON_SPECIALIZE_KERNEL:KERNEL_NET_SCH_TBF \ - +@GLUON_SPECIALIZE_KERNEL:KERNEL_NET_SCH_INGRESS + DEPENDS:=+gluon-core +gluon-wan-dnsmasq +iptables +iptables-mod-extra +simple-tc USERID:=:gluon-mesh-vpn=800 endef diff --git a/package/gluon-mesh-vpn-fastd/Makefile b/package/gluon-mesh-vpn-fastd/Makefile index 087aff5f8..de5111ca5 100644 --- a/package/gluon-mesh-vpn-fastd/Makefile +++ b/package/gluon-mesh-vpn-fastd/Makefile @@ -7,7 +7,7 @@ include ../gluon.mk define Package/gluon-mesh-vpn-fastd TITLE:=Support for connecting meshes via fastd - DEPENDS:=+gluon-core +libgluonutil +gluon-mesh-vpn-core +fastd +@GLUON_SPECIALIZE_KERNEL:KERNEL_TUN + DEPENDS:=+gluon-core +libgluonutil +gluon-mesh-vpn-core +fastd endef $(eval $(call BuildPackageGluon,gluon-mesh-vpn-fastd)) diff --git a/package/gluon-mesh-vpn-tunneldigger/Makefile b/package/gluon-mesh-vpn-tunneldigger/Makefile index b7a5f18d4..376cec098 100644 --- a/package/gluon-mesh-vpn-tunneldigger/Makefile +++ b/package/gluon-mesh-vpn-tunneldigger/Makefile @@ -7,7 +7,7 @@ include ../gluon.mk define Package/gluon-mesh-vpn-tunneldigger TITLE:=Support for connecting meshes via tunneldigger/L2TPv3 pseudowire - DEPENDS:=+gluon-core +gluon-mesh-vpn-core +tunneldigger +@GLUON_SPECIALIZE_KERNEL:KERNEL_L2TP + DEPENDS:=+gluon-core +gluon-mesh-vpn-core +tunneldigger endef $(eval $(call BuildPackageGluon,gluon-mesh-vpn-tunneldigger)) -- GitLab