From d51c948c1f65b73a603ec60be699a1dc038935c8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@toke.dk>
Date: Sat, 17 Dec 2022 22:17:26 +0100
Subject: [PATCH] flent: Integrate flent-tools into the flent package
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Now that we're packaging flent itself, there's no reason to have a
completely separate flent-tools package. So integrate the flent-tools
package specification into the main flent package so it's always kept in
sync.

Also add a dependency from flent itself on flent-tools, as the shell
versions of those utilities that Flent uses when running tests doesn't work
on the busybox shell included with openwrt.

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
---
 net/flent/Makefile         | 36 ++++++++++++++++++++++++++
 utils/flent-tools/Makefile | 53 --------------------------------------
 2 files changed, 36 insertions(+), 53 deletions(-)
 delete mode 100644 utils/flent-tools/Makefile

diff --git a/net/flent/Makefile b/net/flent/Makefile
index 15180f2513..276ff07da4 100644
--- a/net/flent/Makefile
+++ b/net/flent/Makefile
@@ -13,6 +13,7 @@ PKG_LICENSE_FILES:=LICENSE
 
 include ../../lang/python/pypi.mk
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 include ../../lang/python/python3-package.mk
 
 define Package/flent
@@ -27,6 +28,7 @@ define Package/flent
     +python3-logging \
     +python3-distutils \
     +python3-defusedxml \
+    +flent-tools \
     +netperf \
     +fping
 endef
@@ -36,6 +38,40 @@ define Package/flent/description
   netperf/iperf/ping instances and aggregate the results.
 endef
 
+
+define Package/flent-tools
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Helper programs for the Flent test tool
+  URL:=https://flent.org
+  DEPENDS+=+librt +coreutils-sleep +coreutils-date
+endef
+
+define Package/flent-tools/description
+	This builds the C helper programs for gathering data for
+	the Flent network testing tool. These tools are needed for
+	gathering data when a Bash shell is not available (and also
+	perform better than the shell equivalents).
+endef
+
+define Build/Compile/flent-tools
+	$(MAKE) -C $(PKG_BUILD_DIR)/misc \
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
+endef
+
+define Package/flent-tools/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/misc/tc_iterate $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/misc/wifistats_iterate $(1)/usr/sbin/
+endef
+
+define Build/Compile
+	$(call Py3Build/Compile)
+	$(call Build/Compile/flent-tools)
+endef
+
 $(eval $(call Py3Package,flent))
 $(eval $(call BuildPackage,flent))
 $(eval $(call BuildPackage,flent-src))
+$(eval $(call BuildPackage,flent-tools))
diff --git a/utils/flent-tools/Makefile b/utils/flent-tools/Makefile
deleted file mode 100644
index f2f551481c..0000000000
--- a/utils/flent-tools/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (C) 2007-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=flent-tools
-PKG_VERSION:=1.3.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://codeload.github.com/tohojo/flent/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=f71793bb924b36d0e4c230182755c3f5dd26cd7f239b1fa6b717d942258cbf9a
-PKG_BUILD_DIR:=$(BUILD_DIR)/flent-$(PKG_VERSION)
-
-PKG_LICENSE:=GPL-3.0-only
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/flent-tools
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Helper programs for the Flent test tool
-  URL:=https://flent.org
-  MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>
-  DEPENDS+=+librt +coreutils-sleep +coreutils-date
-endef
-
-define Package/flent-tc_iterate/description
-	This builds the C helper programs for gathering data for
-	the Flent network testing tool. These tools are needed for
-	gathering data when a Bash shell is not available (and also
-	perform better than the shell equivalents).
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/misc \
-		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS) -std=gnu99"
-endef
-
-define Package/flent-tools/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/misc/tc_iterate $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/misc/wifistats_iterate $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,flent-tools))
-- 
2.30.2