From a04593f02decbd16f8938b8f377f88c5758c926e Mon Sep 17 00:00:00 2001 From: Anjan Chanda Date: Thu, 5 Jan 2023 12:42:52 +0100 Subject: [PATCH] wfadatad-decollector-4.0.0.1: deprecate wfadatad (deagent) package --- wfadatad/Makefile | 31 ++++--------------------------- 1 file changed, 4 insertions(+), 27 deletions(-) diff --git a/wfadatad/Makefile b/wfadatad/Makefile index 4c214c252..885c20778 100644 --- a/wfadatad/Makefile +++ b/wfadatad/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wfadatad -PKG_VERSION:=2.11.0.4 +PKG_VERSION:=4.0.0.1 LOCAL_DEV=0 ifneq ($(LOCAL_DEV),1) PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=24dcb18f3e60082c70ab17b0707073fd2981f0a9 +PKG_SOURCE_VERSION:=574d22ed710ff4dae441f7c0273b05bbfd5c33ed PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip @@ -22,18 +22,6 @@ PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -define Package/wfadatad - SECTION:=utils - CATEGORY:=Utilities - TITLE:=WiFi DataElements Agent (standalone) daemon - DEPENDS:=+libwifi +libuci +libubox +ubus +libpthread +libnl-genl \ - @(!PACKAGE_map-agent) +libieee1905 +map-plugin -endef - -define Package/wfadatad/description - This package implements WiFi DataElements Agent. -endef - define Package/wfadatad-collector SECTION:=utils CATEGORY:=Utilities @@ -60,7 +48,6 @@ MAKE_FLAGS += DEBUG=1 endif TARGET_CFLAGS += \ - -Wno-error=deprecated-declarations \ -I$(STAGING_DIR)/usr/include \ -I$(STAGING_DIR)/usr/include/libnl3 \ -D_GNU_SOURCE @@ -76,25 +63,15 @@ MAKE_PATH:=src TARGET_CFLAGS += -DEASYMESH_VERSION=$(CONFIG_DECOLLECTOR_EASYMESH_VERSION) EXECS := \ - $(if $(CONFIG_PACKAGE_wfadatad),agent/deagent) \ - $(if $(CONFIG_PACKAGE_wfadatad-collector),collector/decollector) + $(if $(CONFIG_PACKAGE_wfadatad-collector),decollector) MAKE_FLAGS += EXECS="$(EXECS)" - -define Package/wfadatad/install - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) ./files/deagent.init $(1)/etc/init.d/deagent - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/agent/deagent $(1)/usr/sbin/ -endef - define Package/wfadatad-collector/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/collector/decollector $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/decollector $(1)/usr/sbin/ endef -$(eval $(call BuildPackage,wfadatad)) $(eval $(call BuildPackage,wfadatad-collector))