Skip to contentSkip to conversation

package/iperf3: bump to 3.7

PATCH New Matt Weber 2 participants 2 messages Sep 9, 2019 – Sep 10, 2019

lore
Share & tools
lore

Matt Weber

author
#0 lore raw

PATCH 1/1 package/iperf3: bump to 3.7

- Dropped musl and profiling patches as they were incorporated upstream.
- Profiling is set as explicitly disabled as it can now be configured.

---
 package/iperf3/0001-disable-profiling.patch   | 20 ---------
 .../0002-Fix-build-using-musl-libc.patch      | 43 -------------------
 package/iperf3/iperf3.hash                    |  6 +--
 package/iperf3/iperf3.mk                      |  4 +-
 4 files changed, 6 insertions(+), 67 deletions(-)
 delete mode 100644 package/iperf3/0001-disable-profiling.patch
 delete mode 100644 package/iperf3/0002-Fix-build-using-musl-libc.patch
package/iperf3/0001-disable-profiling.patch deleted +0 -20
deleted file mode 100644
index 09da98e974..0000000000
@@ -1,20 +0,0 @@
-This should be an option, but it's not.
-Don't force profiled builds, it breaks on many toolchains.
-Patch Makefile.in to avoid AUTORECONFing since it needs dummy files
-that are missing to succeed (ChangeLog, COPYING, NEWS, README) and it's
-simple enough so avoid pulling in dependencies and delays.
-
-Signed-off-by: Gustavo Zacarias <[email protected]>
-
-diff -Nura iperf-3.0.10.orig/src/Makefile.in iperf-3.0.10/src/Makefile.in
---- iperf-3.0.10.orig/src/Makefile.in	2014-12-17 07:30:46.878310789 -0300
-+++ iperf-3.0.10/src/Makefile.in	2014-12-17 07:33:41.879356643 -0300
-@@ -82,7 +82,7 @@
- host_triplet = @host@
- bin_PROGRAMS = iperf3$(EXEEXT)
- noinst_PROGRAMS = t_timer$(EXEEXT) t_units$(EXEEXT) t_uuid$(EXEEXT) \
--	iperf3_profile$(EXEEXT)
-+	iperf3$(EXEEXT)
- TESTS = t_timer$(EXEEXT) t_units$(EXEEXT) t_uuid$(EXEEXT)
- subdir = src
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
package/iperf3/0002-Fix-build-using-musl-libc.patch deleted +0 -43

43 lines not on this page · raw message

package/iperf3/iperf3.hash +3 -3
index 06dae42149..2e6cfd5ab9 100644
@@ -1,4 +1,4 @@
-# From https://downloads.es.net/pub/iperf/iperf-3.6.tar.gz.sha256
-sha256 de5d51e46dc460cc590fb4d44f95e7cad54b74fea1eba7d6ebd6f8887d75946e  iperf-3.6.tar.gz
+# From https://downloads.es.net/pub/iperf/iperf-3.7.tar.gz.sha256
+sha256	d846040224317caf2f75c843d309a950a7db23f9b44b94688ccbe557d6d1710c  iperf-3.7.tar.gz
 # Locally computed
-sha256 52c42914d7d79fe5e95d0d1b821556d9f06bf756ac910fe085a46d238a33e594  LICENSE
+sha256	ee58f1e69139d39cfb055df15fe84453a379936dd45e44dbebf26c78afa3f5d4  LICENSE
package/iperf3/iperf3.mk +3 -1
index 8ac4b078c4..3537b23824 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-IPERF3_VERSION = 3.6
+IPERF3_VERSION = 3.7
 IPERF3_SITE = https://downloads.es.net/pub/iperf
 IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz
 IPERF3_LICENSE = BSD-3-Clause, BSD-2-Clause, MIT
@@ -12,6 +12,8 @@ IPERF3_LICENSE_FILES = LICENSE
 
 IPERF3_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
 
+IPERF3_CONF_OPTS += --disable-profiling
+
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 # We intentionally don't pass --with-openssl, otherwise pkg-config is
 # not used, and indirect libraries are not picked up when static
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 package/iperf3: bump to 3.7

Quoted 4 lines · On Mon, 9 Sep 2019 14:56:47 -0500 Matt Weber…

- Dropped musl and profiling patches as they were incorporated upstream.
- Profiling is set as explicitly disabled as it can now be configured.

Quoted 8 lines
---
 package/iperf3/0001-disable-profiling.patch   | 20 ---------
 .../0002-Fix-build-using-musl-libc.patch      | 43 -------------------
 package/iperf3/iperf3.hash                    |  6 +--
 package/iperf3/iperf3.mk                      |  4 +-
 4 files changed, 6 insertions(+), 67 deletions(-)
 delete mode 100644 package/iperf3/0001-disable-profiling.patch
 delete mode 100644 package/iperf3/0002-Fix-build-using-musl-libc.patch

You forgot to explain in the commit log why the hash of the license file was changed. So I looked it up, updated the commit log and applied.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com