From 08397bed233f6d02ef179bb2280a521f9314bcc2 Mon Sep 17 00:00:00 2001
From: Anjan Chanda <anjan.chanda@iopsys.eu>
Date: Fri, 14 Apr 2023 10:23:47 +0200
Subject: [PATCH] rename package wfadatad -> decollector

---
 {wfadatad => decollector}/Config.in           |  0
 {wfadatad => decollector}/Makefile            | 25 ++++++++++---------
 {wfadatad => decollector}/files/deagent.init  |  0
 .../files/decollector.init                    |  0
 iop/config                                    |  2 +-
 5 files changed, 14 insertions(+), 13 deletions(-)
 rename {wfadatad => decollector}/Config.in (100%)
 rename {wfadatad => decollector}/Makefile (69%)
 rename {wfadatad => decollector}/files/deagent.init (100%)
 rename {wfadatad => decollector}/files/decollector.init (100%)

diff --git a/wfadatad/Config.in b/decollector/Config.in
similarity index 100%
rename from wfadatad/Config.in
rename to decollector/Config.in
diff --git a/wfadatad/Makefile b/decollector/Makefile
similarity index 69%
rename from wfadatad/Makefile
rename to decollector/Makefile
index a868ab8d0..6ed6afb8f 100644
--- a/wfadatad/Makefile
+++ b/decollector/Makefile
@@ -4,14 +4,14 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=wfadatad
-PKG_VERSION:=4.0.1.7
+PKG_NAME:=decollector
+PKG_VERSION:=4.0.2.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b165177f12b2cef129f36bff1be077b65fbc86aa
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
+PKG_SOURCE_VERSION:=162654487bfbff7d68d0c87ae9498a3def738d84
+PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -22,7 +22,7 @@ PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/wfadatad-collector
+define Package/decollector
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=WiFi DataElements Collector Proxy
@@ -30,12 +30,13 @@ define Package/wfadatad-collector
 	   +libeasy +libwifiutils +libieee1905 +map-plugin
 endef
 
-define Package/wfadatad-collector/description
- It implements the WiFi DataElements Collector Proxy component.
+define Package/decollector/description
+ It implements the WiFi DataElements Agent as defined in the Wi-Fi Alliance's
+ DataElements specification.
 endef
 
 
-define Package/wfadatad-collector/config
+define Package/decollector/config
 	source "$(SOURCE)/Config.in"
 endef
 
@@ -54,7 +55,7 @@ TARGET_CFLAGS += \
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
-  rsync -r --exclude=.* ~/git/wfadatad/ $(PKG_BUILD_DIR)/
+  rsync -r --exclude=.* ~/git/decollector/ $(PKG_BUILD_DIR)/
 endef
 endif
 
@@ -63,15 +64,15 @@ MAKE_PATH:=src
 TARGET_CFLAGS += -DEASYMESH_VERSION=$(CONFIG_DECOLLECTOR_EASYMESH_VERSION)
 
 EXECS := \
-	$(if $(CONFIG_PACKAGE_wfadatad-collector),decollector)
+	$(if $(CONFIG_PACKAGE_decollector),decollector)
 
 MAKE_FLAGS += EXECS="$(EXECS)"
 
-define Package/wfadatad-collector/install
+define Package/decollector/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) ./files/decollector.init $(1)/etc/init.d/decollector
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/decollector $(1)/usr/sbin/
 endef
 
-$(eval $(call BuildPackage,wfadatad-collector))
+$(eval $(call BuildPackage,decollector))
diff --git a/wfadatad/files/deagent.init b/decollector/files/deagent.init
similarity index 100%
rename from wfadatad/files/deagent.init
rename to decollector/files/deagent.init
diff --git a/wfadatad/files/decollector.init b/decollector/files/decollector.init
similarity index 100%
rename from wfadatad/files/decollector.init
rename to decollector/files/decollector.init
diff --git a/iop/config b/iop/config
index ffb6c0e83..d179bf08e 100644
--- a/iop/config
+++ b/iop/config
@@ -65,7 +65,7 @@ CONFIG_PACKAGE_ieee1905=y
 CONFIG_PACKAGE_map-agent=m
 CONFIG_PACKAGE_map-controller=m
 CONFIG_PACKAGE_map-topology=y
-CONFIG_PACKAGE_wfadatad-collector=y
+CONFIG_PACKAGE_decollector=y
 
 # Network #
 CONFIG_PACKAGE_netmode=y