Merge pull request #20099 from tohojo/fix-flent-pkg

flent: fixup flent package
This commit is contained in:
Toke Høiland-Jørgensen 2022-12-19 15:27:42 +01:00 committed by GitHub
commit ac892bb6f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 77 additions and 97 deletions

View File

@ -1,44 +0,0 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python3-flent
PKG_VERSION:=2.0.1
PKG_RELEASE:=$(AUTORELEASE)
PYPI_NAME:=flent
PKG_HASH:=300a09938dc2b4a0463c9144626f25e0bd736fd47806a9444719fa024d671796
PKG_MAINTAINER:=Nick Hainke <vincent@systemli.org>
PKG_LICENSE:=GPL-3.0-only
PKG_LICENSE_FILES:=LICENSE
include ../pypi.mk
include $(INCLUDE_DIR)/package.mk
include ../python3-package.mk
define Package/python3-flent
SECTION:=lang-python
CATEGORY:=Languages
SUBMENU:=Python
TITLE:=The FLExible Network Tester
URL:=https://github.com/tohojo/flent
DEPENDS:= \
+python3-light \
+python3-email \
+python3-urllib \
+python3-uuid \
+python3-logging \
+python3-xml \
+python3-decimal \
+python3-distutils \
+netperf \
+fping
endef
define Package/python3-flent/description
Flent is a Python wrapper to run multiple simultaneous
netperf/iperf/ping instances and aggregate the results.
endef
$(eval $(call Py3Package,python3-flent))
$(eval $(call BuildPackage,python3-flent))
$(eval $(call BuildPackage,python3-flent-src))

77
net/flent/Makefile Normal file
View File

@ -0,0 +1,77 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=flent
PKG_VERSION:=2.1.1
PKG_RELEASE:=1
PYPI_NAME:=flent
PKG_HASH:=db581deac3d8099965dd0d8eee4b9c4d1857bdce5bc97790af9d3ed5b6554f73
PKG_MAINTAINER:=Nick Hainke <vincent@systemli.org>
PKG_LICENSE:=GPL-3.0-only
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
SECTION:=net
CATEGORY:=Network
TITLE:=The FLExible Network Tester
URL:=https://flent.org
CONFLICTS:=python3-flent
DEPENDS:= \
+python3-light \
+python3-uuid \
+python3-logging \
+python3-distutils \
+python3-defusedxml \
+flent-tools \
+netperf \
+fping
endef
define Package/flent/description
Flent is a Python wrapper to run multiple simultaneous
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))

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