From 7a839d30318304f44cb26ac7ceb23d92afb866e4 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Mon, 7 Feb 2022 23:30:26 +0800 Subject: [PATCH] fullconenat: move to network (cherry picked from commit eb0e45cb52a9815791631a86ee7ac56333f94714) --- package/{kernel => network/utils}/fullconenat/Makefile | 8 +++++--- .../{kernel => network/utils}/fullconenat/files/Makefile | 1 - .../utils}/fullconenat/patches/000-printk.patch | 0 3 files changed, 5 insertions(+), 4 deletions(-) rename package/{kernel => network/utils}/fullconenat/Makefile (91%) rename package/{kernel => network/utils}/fullconenat/files/Makefile (99%) rename package/{kernel => network/utils}/fullconenat/patches/000-printk.patch (100%) diff --git a/package/kernel/fullconenat/Makefile b/package/network/utils/fullconenat/Makefile similarity index 91% rename from package/kernel/fullconenat/Makefile rename to package/network/utils/fullconenat/Makefile index 6e3fdb17de..7a66000264 100644 --- a/package/kernel/fullconenat/Makefile +++ b/package/network/utils/fullconenat/Makefile @@ -20,6 +20,8 @@ PKG_MIRROR_HASH:=e7bb77d9916d190b3c02975faf62d1794557d4a4a774cd0cf1f3a6ddb7403e3 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=LICENSE +PKG_MAINTAINER:=Chion Tang + include $(INCLUDE_DIR)/package.mk define Package/iptables-mod-fullconenat @@ -28,7 +30,6 @@ define Package/iptables-mod-fullconenat CATEGORY:=Network TITLE:=FULLCONENAT iptables extension DEPENDS:=+iptables +kmod-ipt-fullconenat - MAINTAINER:=Chion Tang endef define Package/iptables-mod-fullconenat/install @@ -40,8 +41,9 @@ define KernelPackage/ipt-fullconenat SUBMENU:=Netfilter Extensions TITLE:=FULLCONENAT netfilter module DEPENDS:=+kmod-nf-ipt +kmod-nf-nat - MAINTAINER:=Chion Tang - KCONFIG:=CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_CHAIN_EVENTS=y + KCONFIG:= \ + CONFIG_NF_CONNTRACK_EVENTS=y \ + CONFIG_NF_CONNTRACK_CHAIN_EVENTS=y FILES:=$(PKG_BUILD_DIR)/xt_FULLCONENAT.ko endef diff --git a/package/kernel/fullconenat/files/Makefile b/package/network/utils/fullconenat/files/Makefile similarity index 99% rename from package/kernel/fullconenat/files/Makefile rename to package/network/utils/fullconenat/files/Makefile index da52a2a4ed..b2f88db33f 100644 --- a/package/kernel/fullconenat/files/Makefile +++ b/package/network/utils/fullconenat/files/Makefile @@ -4,4 +4,3 @@ libipt_FULLCONENAT.o: libipt_FULLCONENAT.c $(CC) ${CFLAGS} -fPIC -D_INIT=$*_init -c -o $@ $<; obj-m += xt_FULLCONENAT.o - diff --git a/package/kernel/fullconenat/patches/000-printk.patch b/package/network/utils/fullconenat/patches/000-printk.patch similarity index 100% rename from package/kernel/fullconenat/patches/000-printk.patch rename to package/network/utils/fullconenat/patches/000-printk.patch