Add configure options explicitly and switch from the deprecated SF project iperf to the maintained SF project iperf2.
Signed-off-by: Clemens Gruber <clemens.gru...@pqgruber.com> --- patches/iperf-2.0.5/fix_early_termination.diff | 47 -------------------------- patches/iperf-2.0.5/series | 1 - rules/iperf.make | 13 ++++--- 3 files changed, 9 insertions(+), 52 deletions(-) delete mode 100644 patches/iperf-2.0.5/fix_early_termination.diff delete mode 100644 patches/iperf-2.0.5/series diff --git a/patches/iperf-2.0.5/fix_early_termination.diff b/patches/iperf-2.0.5/fix_early_termination.diff deleted file mode 100644 index f24dec727..000000000 --- a/patches/iperf-2.0.5/fix_early_termination.diff +++ /dev/null @@ -1,47 +0,0 @@ -iperf version 2.0.4 running in server mode exits when a client connects -using the -d (duplex) flag. - -To reproduce: On machine foo, run server: - -[somlo@foo]$ iperf -s - -on machine bar, run client in duplex mode: - -[somlo@bar]$ iperf -c foo -d - - -What happens: At the end of the test, the iperf process on machine foo exits. - -What *should* happen: At the end of the test, the iperf process on machine -should keep running, listening for new connections. - -=== - -Patch form L. Gabriel Somlo on the iperf maillist 2009-01-21 -More precisely: http://sourceforge.net/tracker/index.php?func=detail&aid=1983829&group_id=128336&atid=711371 - -Signed-off-by: Wolfram Sang <w.s...@pengutronix.de> - ---- - src/Client.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -Index: src/Client.cpp -=================================================================== ---- src/Client.cpp.orig -+++ src/Client.cpp -@@ -207,10 +207,10 @@ void Client::Run( void ) { - char* readAt = mBuf; - - #if HAVE_THREAD -- if ( !isUDP( mSettings ) ) { -- RunTCP(); -- return; -- } -+// if ( !isUDP( mSettings ) ) { -+// RunTCP(); -+// return; -+// } - #endif - - // Indicates if the stream is readable diff --git a/patches/iperf-2.0.5/series b/patches/iperf-2.0.5/series deleted file mode 100644 index c490ac05d..000000000 --- a/patches/iperf-2.0.5/series +++ /dev/null @@ -1 +0,0 @@ -fix_early_termination.diff -p0 diff --git a/rules/iperf.make b/rules/iperf.make index 8f73dfcf2..99b4f00e2 100644 --- a/rules/iperf.make +++ b/rules/iperf.make @@ -16,11 +16,11 @@ PACKAGES-$(PTXCONF_IPERF) += iperf # # Paths and names # -IPERF_VERSION := 2.0.5 -IPERF_MD5 := 44b5536b67719f4250faed632a3cd016 +IPERF_VERSION := 2.0.9 +IPERF_MD5 := 351b018b71176b8cb25f20eef6a9e37c IPERF := iperf-$(IPERF_VERSION) IPERF_SUFFIX := tar.gz -IPERF_URL := $(call ptx/mirror, SF, iperf/$(IPERF).$(IPERF_SUFFIX)) +IPERF_URL := $(call ptx/mirror, SF, iperf2/$(IPERF).$(IPERF_SUFFIX)) IPERF_SOURCE := $(SRCDIR)/$(IPERF).$(IPERF_SUFFIX) IPERF_DIR := $(BUILDDIR)/$(IPERF) IPERF_LICENSE := BSD @@ -37,7 +37,12 @@ IPERF_ENV := $(CROSS_ENV) # IPERF_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ - $(GLOBAL_IPV6_OPTION) + $(GLOBAL_IPV6_OPTION) \ + --disable-multicast \ + --enable-threads \ + --disable-debuginfo \ + --disable-web100 \ + --enable-kalman # ---------------------------------------------------------------------------- # Target-Install -- 2.11.0 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de
