From 404552e19839ee03b8a176a9d5768b89fe6ee20c Mon Sep 17 00:00:00 2001
From: sbwml <admin@cooluc.com>
Date: Wed, 13 Nov 2024 02:35:07 +0800
Subject: [PATCH] daed: drop daed-geoip & daed-geosite

Signed-off-by: sbwml <admin@cooluc.com>
---
 daed/Makefile          | 28 +---------------------------
 daed/files/daed.init   |  1 +
 luci-app-daed/Makefile |  2 +-
 3 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/daed/Makefile b/daed/Makefile
index d7eac6ecd..4f0cf9222 100644
--- a/daed/Makefile
+++ b/daed/Makefile
@@ -49,21 +49,7 @@ define Package/daed
   # You need enable KERNEL_DEBUG_INFO_BTF and KERNEL_BPF_EVENTS
   DEPENDS:=$(GO_ARCH_DEPENDS) $(BPF_DEPENDS) \
     +ca-bundle +kmod-sched-core +kmod-sched-bpf +kmod-xdp-sockets-diag \
-    +kmod-veth
-endef
-
-define Package/daed-geoip
-  $(call Package/daed/Default)
-  TITLE:=geoip for daed
-  DEPENDS:=+daed +v2ray-geoip
-  PKGARCH:=all
-endef
-
-define Package/daed-geosite
-  $(call Package/daed/Default)
-  TITLE:=geosite for daed
-  DEPENDS:=+daed +v2ray-geosite
-  PKGARCH:=all
+    +kmod-veth +v2ray-geoip +v2ray-geosite
 endef
 
 define Package/daed/description
@@ -145,18 +131,6 @@ define Package/daed/install
 	$(INSTALL_BIN) $(CURDIR)/files/daed.init $(1)/etc/init.d/daed
 endef
 
-define Package/daed-geoip/install
-	$(INSTALL_DIR) $(1)/usr/share/daed
-	$(LN) ../v2ray/geoip.dat $(1)/usr/share/daed/geoip.dat
-endef
-
-define Package/daed-geosite/install
-	$(INSTALL_DIR) $(1)/usr/share/daed
-	$(LN) ../v2ray/geosite.dat $(1)/usr/share/daed/geosite.dat
-endef
-
 $(eval $(call Download,daed-web))
 $(eval $(call GoBinPackage,daed))
 $(eval $(call BuildPackage,daed))
-$(eval $(call BuildPackage,daed-geoip))
-$(eval $(call BuildPackage,daed-geosite))
diff --git a/daed/files/daed.init b/daed/files/daed.init
index baa72884e..4f8f51727 100644
--- a/daed/files/daed.init
+++ b/daed/files/daed.init
@@ -21,6 +21,7 @@ start_service() {
 	config_get log_maxsize "config" "log_maxsize" "5"
 
 	procd_open_instance "$CONF"
+	procd_set_param env DAE_LOCATION_ASSET="/usr/share/v2ray"
 	procd_set_param command "$PROG" run
 	procd_append_param command --config "/etc/daed/"
 	procd_append_param command --listen "$listen_addr"
diff --git a/luci-app-daed/Makefile b/luci-app-daed/Makefile
index ff102937b..ea41106d2 100644
--- a/luci-app-daed/Makefile
+++ b/luci-app-daed/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI app for dae dashboard
-LUCI_DEPENDS:=+daed +daed-geoip +daed-geosite
+LUCI_DEPENDS:=+daed
 LUCI_PKGARCH:=all
 
 include $(TOPDIR)/feeds/luci/luci.mk