From 3bd3039de41ee993e128b23d2cbae0daec7e2b2b 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 | 6 ++++-- .../utils}/fullconenat/patches/000-printk.patch | 0 package/{kernel => network/utils}/fullconenat/src/Makefile | 0 3 files changed, 4 insertions(+), 2 deletions(-) rename package/{kernel => network/utils}/fullconenat/Makefile (93%) rename package/{kernel => network/utils}/fullconenat/patches/000-printk.patch (100%) rename package/{kernel => network/utils}/fullconenat/src/Makefile (100%) diff --git a/package/kernel/fullconenat/Makefile b/package/network/utils/fullconenat/Makefile similarity index 93% rename from package/kernel/fullconenat/Makefile rename to package/network/utils/fullconenat/Makefile index f094067ebc..1573fc5861 100644 --- a/package/kernel/fullconenat/Makefile +++ b/package/network/utils/fullconenat/Makefile @@ -19,7 +19,7 @@ PKG_MIRROR_HASH:=00d749235271dee194dcd23c22e6e85207ea90192a62a110b2af0b4e4de1971 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Chion Tang +PKG_MAINTAINER:=Chion Tang include $(INCLUDE_DIR)/package.mk @@ -43,7 +43,9 @@ define KernelPackage/ipt-fullconenat SUBMENU:=Netfilter Extensions TITLE:=FULLCONENAT netfilter module DEPENDS:=+kmod-nf-ipt +kmod-nf-nat - 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/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 diff --git a/package/kernel/fullconenat/src/Makefile b/package/network/utils/fullconenat/src/Makefile similarity index 100% rename from package/kernel/fullconenat/src/Makefile rename to package/network/utils/fullconenat/src/Makefile