From c56cb30b3bbb8205f5ccb6dc123af9b2999cf7fd Mon Sep 17 00:00:00 2001 From: Rahul Thakur Date: Wed, 20 Nov 2024 09:43:47 +0000 Subject: [PATCH] ebtables-extensions: merge gnx ebt extensions --- ebtables-extensions/Makefile | 172 ++++++++++++++++++++++++++++++++--- 1 file changed, 160 insertions(+), 12 deletions(-) diff --git a/ebtables-extensions/Makefile b/ebtables-extensions/Makefile index 490ad7629..0729d230a 100644 --- a/ebtables-extensions/Makefile +++ b/ebtables-extensions/Makefile @@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ebtables-extensions -PKG_VERSION:=1.0.4 +PKG_VERSION:=2.0.0 PKG_LICENSE:=GPL-2.0 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=35fb79f95c47d90e3791c7e126048b451f078f24 +PKG_SOURCE_VERSION:=41985f9a47f70e87258948d648dab95b603de417 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ebtables-extensions.git PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip @@ -25,7 +25,7 @@ define KernelPackage/vlantranslation TITLE:=Kernel module for ebtables VLAN translation FILES:=$(PKG_BUILD_DIR)/src/ebt_vlantranslation.ko DEPENDS+=+kmod-ebtables - AUTOLOAD:=$(call AutoLoad,30,ebt_vlantranslation,1) + AUTOLOAD:=$(call AutoLoad,30,ebt_vlantranslation) KCONFIG:= endef @@ -34,43 +34,182 @@ define KernelPackage/dscp2pbit TITLE:=Kernel module for DSCP-to-Pbit mapping DEPENDS+=+kmod-ebtables FILES:=$(PKG_BUILD_DIR)/src/ebt_dscp2pbit.ko - AUTOLOAD:=$(call AutoLoad,30,ebt_dscp2pbit,1) + AUTOLOAD:=$(call AutoLoad,30,ebt_dscp2pbit) KCONFIG:= endef +define KernelPackage/dhcp + SUBMENU:=Other modules + TITLE:=Kernel module for ebtables DHCP snooping + FILES:=$(PKG_BUILD_DIR)/src/ebt_dhcp.ko + DEPENDS+=+kmod-ebtables + AUTOLOAD:=$(call AutoLoad,30,ebt_dhcp) + KCONFIG:= +endef + +define KernelPackage/dhcpv6 + SUBMENU:=Other modules + TITLE:=Kernel module for ebtables DHCPv6 snooping + FILES:=$(PKG_BUILD_DIR)/src/ebt_dhcpv6.ko + DEPENDS+=+kmod-ebtables + AUTOLOAD:=$(call AutoLoad,30,ebt_dhcpv6) + KCONFIG:= +endef + +define KernelPackage/ra + SUBMENU:=Other modules + TITLE:=Kernel module for ebtables NDP/RA snooping + FILES:=$(PKG_BUILD_DIR)/src/ebt_ra.ko + DEPENDS+=+kmod-ebtables + AUTOLOAD:=$(call AutoLoad,30,ebt_ra) + KCONFIG:= +endef + +define KernelPackage/dns + SUBMENU:=Other modules + TITLE:=Kernel module for ebtables DNS manipulation + FILES:=$(PKG_BUILD_DIR)/src/ebt_dns.ko + DEPENDS+=+kmod-ebtables + AUTOLOAD:=$(call AutoLoad,30,ebt_dns) + KCONFIG:= +endef + +define KernelPackage/pppoe_disc + SUBMENU:=Other modules + TITLE:=Kernel module for ebtables PPPoE manipulation + FILES:=$(PKG_BUILD_DIR)/src/ebt_pppoe_disc.ko + DEPENDS+=+kmod-ebtables + AUTOLOAD:=$(call AutoLoad,30,ebt_pppoe_disc) + KCONFIG:= +endef + +define KernelPackage/l2pt + SUBMENU:=Other modules + TITLE:=Kernel module for ebtables L2CP tunneling + FILES:=$(PKG_BUILD_DIR)/src/ebt_l2pt.ko + DEPENDS+=@TARGET_airoha +kmod-ebtables + AUTOLOAD:=$(call AutoLoad,30,ebt_l2pt) + KCONFIG:= +endef + +define KernelPackage/xtarp + SUBMENU:=Other modules + TITLE:=Kernel module for ebtables extended ARP matching + FILES:=$(PKG_BUILD_DIR)/src/ebt_xtarp.ko + DEPENDS+=+kmod-ebtables + AUTOLOAD:=$(call AutoLoad,30,ebt_xtarp) + KCONFIG:= +endef + +define KernelPackage/xtip + SUBMENU:=Other modules + TITLE:=Kernel module for ebtables extended IPv4 matching + FILES:=$(PKG_BUILD_DIR)/src/ebt_xtip.ko + DEPENDS+=+kmod-ebtables + AUTOLOAD:=$(call AutoLoad,30,ebt_xtip) + KCONFIG:= +endef + +define KernelPackage/xtip6 + SUBMENU:=Other modules + TITLE:=Kernel module for ebtables extended IPv6 matching + FILES:=$(PKG_BUILD_DIR)/src/ebt_xtip6.ko + DEPENDS+=+kmod-ebtables + AUTOLOAD:=$(call AutoLoad,30,ebt_xtip6) + KCONFIG:= +endef + +define KernelPackage/dhcp/description + Kernel module to enable DHCP snooping for ebtables +endef + +define KernelPackage/dhcpv6/description + Kernel module to enable DHCPv6 snooping for ebtables +endef + +define KernelPackage/ra/description + Kernel module to enable NDP/RA snooping for ebtables +endef + +define KernelPackage/dns/description + Kernel module to enable DNS manipulation for ebtables +endef + +define KernelPackage/pppoe_disc/description + Kernel module to enable PPPoE manipulation for ebtables +endef + +define KernelPackage/l2pt/description + Kernel module to enable L2CP tunneling for ebtables +endef + +define KernelPackage/xtarp/description + Kernel module to enable extended ARP matching for ebtables +endef + +define KernelPackage/xtip/description + Kernel module to enable extended IPv4 matching for ebtables +endef + +define KernelPackage/xtip6/description + Kernel module to enable extended IPv6 matching for ebtables +endef + define KernelPackage/vlantranslation/description Kernel module to enable VLAN translation for ebtables endef define KernelPackage/dscp2pbit/description - Kernel module to enableDSCP-to-Pbit mapping for ebtables + Kernel module to enable DSCP-to-Pbit mapping for ebtables endef ifeq ($(CONFIG_TARGET_brcmbca),y) include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk endif +define Build/Prepare + ifeq ($(LOCAL_DEV),1) -define Build/Prepare - $(CP) -rf ./src/* $(PKG_BUILD_DIR)/ - $(CP) $(PKG_BUILD_DIR)/src/ebt_vlantranslation.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/ - $(CP) $(PKG_BUILD_DIR)/src/ebt_dscp2pbit.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/ -endef + $(CP) -rf ./ebtables-extensions/* $(PKG_BUILD_DIR)/ else -define Build/Prepare $(Build/Prepare/Default) +endif $(CP) $(PKG_BUILD_DIR)/src/ebt_vlantranslation.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/ $(CP) $(PKG_BUILD_DIR)/src/ebt_dscp2pbit.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/ -endef + $(CP) $(PKG_BUILD_DIR)/src/ebt_dhcp.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/ + $(CP) $(PKG_BUILD_DIR)/src/ebt_dhcpv6.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/ + $(CP) $(PKG_BUILD_DIR)/src/ebt_ra.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/ + $(CP) $(PKG_BUILD_DIR)/src/ebt_dns.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/ + $(CP) $(PKG_BUILD_DIR)/src/ebt_pppoe_disc.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/ +ifeq ($(CONFIG_TARGET_airoha),y) + $(CP) $(PKG_BUILD_DIR)/src/ebt_l2pt.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/ endif + $(CP) $(PKG_BUILD_DIR)/src/ebt_xtarp.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/ + $(CP) $(PKG_BUILD_DIR)/src/ebt_xtip.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/ + $(CP) $(PKG_BUILD_DIR)/src/ebt_xtip6.h $(LINUX_DIR)/include/uapi/linux/netfilter_bridge/ +endef define Build/InstallDev $(INSTALL_DIR) $(1)/include/uapi/linux/netfilter_bridge/ $(CP) $(PKG_BUILD_DIR)/src/ebt_vlantranslation.h $(1)/include/uapi/linux/netfilter_bridge/ $(CP) $(PKG_BUILD_DIR)/src/ebt_dscp2pbit.h $(1)/include/uapi/linux/netfilter_bridge/ + $(CP) $(PKG_BUILD_DIR)/src/ebt_dhcp.h $(1)/include/uapi/linux/netfilter_bridge/ + $(CP) $(PKG_BUILD_DIR)/src/ebt_dhcpv6.h $(1)/include/uapi/linux/netfilter_bridge/ + $(CP) $(PKG_BUILD_DIR)/src/ebt_ra.h $(1)/include/uapi/linux/netfilter_bridge/ + $(CP) $(PKG_BUILD_DIR)/src/ebt_dns.h $(1)/include/uapi/linux/netfilter_bridge/ + $(CP) $(PKG_BUILD_DIR)/src/ebt_pppoe_disc.h $(1)/include/uapi/linux/netfilter_bridge/ +ifeq ($(CONFIG_TARGET_airoha),y) + $(CP) $(PKG_BUILD_DIR)/src/ebt_l2pt.h $(1)/include/uapi/linux/netfilter_bridge/ +endif + $(CP) $(PKG_BUILD_DIR)/src/ebt_xtarp.h $(1)/include/uapi/linux/netfilter_bridge/ + $(CP) $(PKG_BUILD_DIR)/src/ebt_xtip.h $(1)/include/uapi/linux/netfilter_bridge/ + $(CP) $(PKG_BUILD_DIR)/src/ebt_xtip6.h $(1)/include/uapi/linux/netfilter_bridge/ endef KERNEL_MAKE_FLAGS += -I$(LINUX_DIR)/include +ifeq ($(CONFIG_TARGET_airoha),y) + KERNEL_MAKE_FLAGS += PLATFORM="ECONET" +endif define Build/Compile $(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/src" modules @@ -78,3 +217,12 @@ endef $(eval $(call KernelPackage,vlantranslation)) $(eval $(call KernelPackage,dscp2pbit)) +$(eval $(call KernelPackage,dhcp)) +$(eval $(call KernelPackage,dhcpv6)) +$(eval $(call KernelPackage,ra)) +$(eval $(call KernelPackage,dns)) +$(eval $(call KernelPackage,pppoe_disc)) +$(eval $(call KernelPackage,l2pt)) +$(eval $(call KernelPackage,xtarp)) +$(eval $(call KernelPackage,xtip)) +$(eval $(call KernelPackage,xtip6))