From 946963a212b62748487e75d64e877d6220f49403 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Mon, 1 Feb 2021 11:40:06 +0800
Subject: [PATCH] fast-classifier: clearup Makefile

Fast-classifier should be started last, so just let luci control it.

Signed-off-by: Tianling Shen <cnsztl@gmail.com>
---
 package/lean/fast-classifier/Makefile | 49 ++-------------------------
 1 file changed, 2 insertions(+), 47 deletions(-)

diff --git a/package/lean/fast-classifier/Makefile b/package/lean/fast-classifier/Makefile
index 34f7cc4865..1bb5cba853 100644
--- a/package/lean/fast-classifier/Makefile
+++ b/package/lean/fast-classifier/Makefile
@@ -6,7 +6,7 @@ PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-define KernelPackage/fast-classifier/template
+define KernelPackage/fast-classifier
   SECTION:=kernel
   CATEGORY:=Kernel modules
   SUBMENU:=Network Support
@@ -19,39 +19,10 @@ define KernelPackage/fast-classifier/template
   PROVIDES:=fast-classifier
 endef
 
-define KernelPackage/fast-classifier
-  $(call KernelPackage/fast-classifier/template)
-  AUTOLOAD:=$(call AutoLoad,10,fast-classifier)
-endef
-
-define KernelPackage/fast-classifier-noload
-  $(call KernelPackage/fast-classifier/template)
-  TITLE+= (no autoload)
-endef
-
-define KernelPackage/fast-classifier/description/template
+define KernelPackage/fast-classifier/description
   FAST Classifier talks to SFE to make decisions about offloading connections
 endef
 
-KernelPackage/fast-classifier/description = $(KernelPackage/fast-classifier/description/template)
-
-define KernelPackage/fast-classifier-noload/description
-  $(call KernelPackage/fast-classifier/description/template)
-  This package does not load fast-classifier at boot by default
-endef
-
-define Package/fast-classifier-example
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Example user space program for fast-classifier
-  DEPENDS:=+libnl +kmod-fast-classifier
-endef
-
-define Package/fast-classifier-example/description
-  Example user space program that communicates with fast
-  classifier kernel module
-endef
-
 SFE_MAKE_OPTS:=SFE_SUPPORT_IPV6=y
 
 define Build/Compile
@@ -62,15 +33,6 @@ define Build/Compile
 		CONFIG_FAST_CLASSIFIER=m \
 		EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
 		modules
-
-ifneq ($(CONFIG_PACKAGE_fast-classifier-example),)
-	$(TARGET_CC) -o $(PKG_BUILD_DIR)/userspace_fast_classifier \
-		-I $(PKG_BUILD_DIR) \
-		-I$(STAGING_DIR)/usr/include/libnl \
-		-I$(STAGING_DIR)/usr/include/libnl3 \
-		-lnl-genl-3 -lnl-3 \
-		$(PKG_BUILD_DIR)/nl_classifier_test.c
-endif
 endef
 
 define Build/InstallDev
@@ -78,11 +40,4 @@ define Build/InstallDev
 	$(CP) $(PKG_BUILD_DIR)/fast-classifier.h $(1)/usr/include/
 endef
 
-define Package/fast-classifier-example/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/userspace_fast_classifier $(1)/sbin/
-endef
-
 $(eval $(call KernelPackage,fast-classifier))
-$(eval $(call KernelPackage,fast-classifier-noload))
-$(eval $(call BuildPackage,fast-classifier-example))