CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

iperf: rename to iperf2 and bump 2.0.5 -> 2.0.10

Browse Source 
Both iperf2 and iperf3 are actively maintained projects. iperf2 was
forked from the old iperf codebase because iperf3 is an incompatible
and as of yet incomplete rewrite from scratch.

Rename the old iperf to ipref2 to avoid ambiguity. Drop all 3 patches
we were carrying because they got merged upstream.

Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Ioan-Adrian Ratiu 2018-01-22 19:45:15 +02:00 committed by Armin Kuster
parent ea5310a155
commit 196186de63
5 changed files with 19 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch
View File

@ -1,52 +0,0 @@
iperf: fix out of tree configuration
The configure step uses a package header to check for support of types/declares,
this package header encapsulates all the required system header for providing
the needed resources. When configured from an out of tree directory the package
header is not found due to the hard path.
We now make the path for package header relative to our 'srcdir' so it is
found appropriately.
Signed-off-by: Awais Belal <awais_belal@mentor.com>
---
diff --git a/configure.ac b/configure.ac
index 2b3fd20..d420f9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,8 +176,8 @@ dnl Check for system services
dnl check for multicast
if test "$ac_cv_multicast" != no; then
- AC_CHECK_TYPES(struct ip_mreq,,,[#include "compat/headers_slim.h"])
- AC_CHECK_DECLS(IP_ADD_MEMBERSHIP,,,[#include "compat/headers_slim.h"])
+ AC_CHECK_TYPES(struct ip_mreq,,,[#include "${srcdir}/compat/headers_slim.h"])
+ AC_CHECK_DECLS(IP_ADD_MEMBERSHIP,,,[#include "${srcdir}/compat/headers_slim.h"])
AC_MSG_CHECKING(for multicast support)
ac_cv_multicast=no
if test "$ac_cv_have_decl_IP_ADD_MEMBERSHIP" = yes; then
@@ -193,9 +193,9 @@ fi
dnl check for IPv6
if test "$ac_cv_have_ipv6" != no; then
- AC_CHECK_TYPES(struct sockaddr_storage,,,[#include "compat/headers_slim.h"])
- AC_CHECK_TYPES(struct sockaddr_in6,,,[#include "compat/headers_slim.h"])
- AC_CHECK_DECLS(AF_INET6,,,[#include "compat/headers_slim.h"])
+ AC_CHECK_TYPES(struct sockaddr_storage,,,[#include "${srcdir}/compat/headers_slim.h"])
+ AC_CHECK_TYPES(struct sockaddr_in6,,,[#include "${srcdir}/compat/headers_slim.h"])
+ AC_CHECK_DECLS(AF_INET6,,,[#include "${srcdir}/compat/headers_slim.h"])
AC_MSG_CHECKING(for IPv6 headers and structures)
ac_cv_have_ipv6=no
if test "$ac_cv_type_struct_sockaddr_storage" = yes; then
@@ -211,9 +211,9 @@ fi
if test "$ac_cv_have_ipv6" = yes; then
if test "$ac_cv_multicast" = yes; then
- AC_CHECK_TYPES(struct ipv6_mreq,,,[#include "compat/headers_slim.h"])
- AC_CHECK_DECLS(IPV6_ADD_MEMBERSHIP,,,[#include "compat/headers_slim.h"])
- AC_CHECK_DECLS(IPV6_MULTICAST_HOPS,,,[#include "compat/headers_slim.h"])
+ AC_CHECK_TYPES(struct ipv6_mreq,,,[#include "${srcdir}/compat/headers_slim.h"])
+ AC_CHECK_DECLS(IPV6_ADD_MEMBERSHIP,,,[#include "${srcdir}/compat/headers_slim.h"])
+ AC_CHECK_DECLS(IPV6_MULTICAST_HOPS,,,[#include "${srcdir}/compat/headers_slim.h"])
AC_MSG_CHECKING(for IPv6 multicast support)
ac_cv_have_ipv6_multicast=no
if test "$ac_cv_type_struct_ipv6_mreq" = yes; then

16
meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch
View File

@ -1,16 +0,0 @@
--- iperf-2.0.5/m4/dast.m4.orig 2016-06-15 11:42:03.945581785 -0400
+++ iperf-2.0.5/m4/dast.m4 2016-06-15 11:42:11.053581641 -0400
@@ -11,7 +11,12 @@
AC_DEFUN(DAST_CHECK_BOOL, [
-AC_CHECK_SIZEOF(bool)
+if test "$ac_cv_header_stdbool_h" = yes; then
+ AC_CHECK_SIZEOF(bool,,[#include <stdbool.h>])
+else
+ AC_CHECK_SIZEOF(bool)
+fi
+
if test "$ac_cv_sizeof_bool" = 0 ; then
AC_DEFINE(bool, int)
fi

8
meta-oe/recipes-benchmark/iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch
View File

@ -1,8 +0,0 @@
diff --git iperf-2.0.5/man/Makefile.am iperf-2.0.5/man/Makefile.am
index ed97bc6..728873f 100644
--- iperf-2.0.5/man/Makefile.am
+++ iperf-2.0.5/man/Makefile.am
@@ -1,2 +1 @@
-man_MANS = iperf.1
-dist_man_MANS = $(man_MANS)
+dist_man_MANS = iperf.1

23
meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb
View File

@ -1,23 +0,0 @@
DESCRIPTION = "Iperf is a tool to measure maximum TCP bandwidth, allowing the tuning of various parameters and UDP characteristics"
HOMEPAGE = "http://dast.nlanr.net/Projects/Iperf/"
SECTION = "console/network"
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=e8478eae9f479e39bc34975193360298"
SRC_URI = " ${SOURCEFORGE_MIRROR}/iperf/${BP}.tar.gz \
file://iperf-2.0.5_ManPage.patch \
file://0001-fix-out-of-tree-config.patch \
file://0002-fix-bool-size-m4.patch \
"
SRC_URI[md5sum] = "44b5536b67719f4250faed632a3cd016"
SRC_URI[sha256sum] = "636b4eff0431cea80667ea85a67ce4c68698760a9837e1e9d13096d20362265b"
S = "${WORKDIR}/${BP}"
inherit autotools pkgconfig
EXTRA_OECONF = "--exec-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}"
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}"
PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"

19
meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb Normal file
View File

@ -0,0 +1,19 @@
DESCRIPTION = "Iperf is a tool to measure maximum TCP bandwidth, allowing the tuning of various parameters and UDP characteristics"
HOMEPAGE = "https://sourceforge.net/projects/iperf2/"
SECTION = "console/network"
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://COPYING;md5=e136a7b2560d80bcbf0d9b3e1356ecff"
SRC_URI = " ${SOURCEFORGE_MIRROR}/iperf2/iperf-${PV}.tar.gz"
SRC_URI[md5sum] = "097cf0754bc1afa165975c06a91e6906"
SRC_URI[sha256sum] = "7fe4348dcca313b74e0aa9c34a8ccd713b84a5615b8578f4aa94cedce9891ef2"
S = "${WORKDIR}/iperf-${PV}"
inherit autotools pkgconfig
EXTRA_OECONF = "--exec-prefix=${STAGING_DIR_HOST}${layout_exec_prefix}"
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}"
PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"