Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

flent: Integrate flent-tools into the flent package

Browse source 
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>
This commit is contained in:
Toke Høiland-Jørgensen 2022-12-17 22:17:26 +01:00
parent 6818f1e521
commit d51c948c1f
2 changed files with 36 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
net/flent/Makefile
View file

@ -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))

53
utils/flent-tools/Makefile
View file

@ -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))