* [Buildroot] [PATCH 1/2] package/iperf3: bump version to 3.1.1, switch upstream to github
@ 2016-01-23 21:52 Bernd Kuhls
2016-01-23 21:52 ` [Buildroot] [PATCH 2/2] package/iperf3: fix musl build Bernd Kuhls
2016-01-26 21:58 ` [Buildroot] [PATCH 1/2] package/iperf3: bump version to 3.1.1, switch upstream to github Thomas Petazzoni
0 siblings, 2 replies; 4+ messages in thread
From: Bernd Kuhls @ 2016-01-23 21:52 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/iperf3/Config.in | 2 +-
package/iperf3/iperf3.hash | 2 +-
package/iperf3/iperf3.mk | 5 ++---
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/package/iperf3/Config.in b/package/iperf3/Config.in
index 18c3612..074c1d3 100644
--- a/package/iperf3/Config.in
+++ b/package/iperf3/Config.in
@@ -10,7 +10,7 @@ config BR2_PACKAGE_IPERF3
It's a redesign of the NLANR/DAST iperf(2) and is not
backward compatible.
- https://iperf.fr
+ http://software.es.net/iperf/index.html
comment "iperf3 needs a toolchain w/ threads"
depends on !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/iperf3/iperf3.hash b/package/iperf3/iperf3.hash
index 9fb2cba..4b9332d 100644
--- a/package/iperf3/iperf3.hash
+++ b/package/iperf3/iperf3.hash
@@ -1,2 +1,2 @@
# Locally calculated
-sha256 94fef2c3a51d01f0b1ee899bf02c87ff392423fb8c8d0af34fd59c1462c8bbb0 iperf-3.1-source.tar.gz
+sha256 86f292e554d42d1bddbd5f587e594005f4ca202c284e4da45ed8cfbe935a5be8 iperf3-3.1.1.tar.gz
diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk
index d1338e6..885a599 100644
--- a/package/iperf3/iperf3.mk
+++ b/package/iperf3/iperf3.mk
@@ -4,9 +4,8 @@
#
################################################################################
-IPERF3_VERSION = 3.1
-IPERF3_SITE = https://iperf.fr/download/iperf_$(IPERF3_VERSION)
-IPERF3_SOURCE = iperf-$(IPERF3_VERSION)-source.tar.gz
+IPERF3_VERSION = 3.1.1
+IPERF3_SITE = $(call github,esnet,iperf,$(IPERF3_VERSION))
IPERF3_LICENSE = BSD-3c, BSD-2c, MIT
IPERF3_LICENSE_FILES = LICENSE
--
2.7.0.rc3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] package/iperf3: fix musl build
2016-01-23 21:52 [Buildroot] [PATCH 1/2] package/iperf3: bump version to 3.1.1, switch upstream to github Bernd Kuhls
@ 2016-01-23 21:52 ` Bernd Kuhls
2016-01-26 22:00 ` Thomas Petazzoni
2016-01-26 21:58 ` [Buildroot] [PATCH 1/2] package/iperf3: bump version to 3.1.1, switch upstream to github Thomas Petazzoni
1 sibling, 1 reply; 4+ messages in thread
From: Bernd Kuhls @ 2016-01-23 21:52 UTC (permalink / raw)
To: buildroot
Ported -D_GNU_SOURCE from https://dev.openwrt.org/changeset/45103
Sent patch upstream: https://github.com/esnet/iperf/issues/331
Fixes
http://autobuild.buildroot.net/results/50e/50e34db9e273ebb7b8a9198dec254f6b22e26eff/
http://autobuild.buildroot.net/results/efd/efd241ecfcece28b4541ce19851418a1a4172425/
and others
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/iperf3/0002-musl.patch | 27 +++++++++++++++++++++++++++
package/iperf3/iperf3.mk | 2 ++
2 files changed, 29 insertions(+)
create mode 100644 package/iperf3/0002-musl.patch
diff --git a/package/iperf3/0002-musl.patch b/package/iperf3/0002-musl.patch
new file mode 100644
index 0000000..764c00b
--- /dev/null
+++ b/package/iperf3/0002-musl.patch
@@ -0,0 +1,27 @@
+Fix musl build
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+diff -uNr iperf-3.1.1.org/src/cjson.h iperf-3.1.1/src/cjson.h
+--- iperf-3.1.1.org/src/cjson.h 2015-11-19 18:23:48.000000000 +0100
++++ iperf-3.1.1/src/cjson.h 2016-01-23 22:45:28.000000000 +0100
+@@ -23,6 +23,8 @@
+ #ifndef cJSON__h
+ #define cJSON__h
+
++#include <stdint.h>
++
+ #ifdef __cplusplus
+ extern "C"
+ {
+diff -uNr iperf-3.1.1.org/src/timer.h iperf-3.1.1/src/timer.h
+--- iperf-3.1.1.org/src/timer.h 2015-11-19 18:23:48.000000000 +0100
++++ iperf-3.1.1/src/timer.h 2016-01-23 22:42:30.000000000 +0100
+@@ -30,6 +30,7 @@
+ #ifndef __TIMER_H
+ #define __TIMER_H
+
++#include <stdint.h>
+ #include <sys/time.h>
+
+ /* TimerClientData is an opaque value that tags along with a timer. The
diff --git a/package/iperf3/iperf3.mk b/package/iperf3/iperf3.mk
index 885a599..74d6cce 100644
--- a/package/iperf3/iperf3.mk
+++ b/package/iperf3/iperf3.mk
@@ -9,4 +9,6 @@ IPERF3_SITE = $(call github,esnet,iperf,$(IPERF3_VERSION))
IPERF3_LICENSE = BSD-3c, BSD-2c, MIT
IPERF3_LICENSE_FILES = LICENSE
+IPERF3_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"
+
$(eval $(autotools-package))
--
2.7.0.rc3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/2] package/iperf3: bump version to 3.1.1, switch upstream to github
2016-01-23 21:52 [Buildroot] [PATCH 1/2] package/iperf3: bump version to 3.1.1, switch upstream to github Bernd Kuhls
2016-01-23 21:52 ` [Buildroot] [PATCH 2/2] package/iperf3: fix musl build Bernd Kuhls
@ 2016-01-26 21:58 ` Thomas Petazzoni
1 sibling, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2016-01-26 21:58 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
On Sat, 23 Jan 2016 22:52:21 +0100, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/iperf3/Config.in | 2 +-
> package/iperf3/iperf3.hash | 2 +-
> package/iperf3/iperf3.mk | 5 ++---
> 3 files changed, 4 insertions(+), 5 deletions(-)
Applied, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] package/iperf3: fix musl build
2016-01-23 21:52 ` [Buildroot] [PATCH 2/2] package/iperf3: fix musl build Bernd Kuhls
@ 2016-01-26 22:00 ` Thomas Petazzoni
0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2016-01-26 22:00 UTC (permalink / raw)
To: buildroot
Dear Bernd Kuhls,
On Sat, 23 Jan 2016 22:52:22 +0100, Bernd Kuhls wrote:
> Ported -D_GNU_SOURCE from https://dev.openwrt.org/changeset/45103
> Sent patch upstream: https://github.com/esnet/iperf/issues/331
No, this is not submitted upstream. To really submit a patch upstream,
you have to actually submit a pull request to the project, not simply
point to some random Buildroot patchwork entry. If you leave it like
this, the patch is never going to be merged.
> diff --git a/package/iperf3/0002-musl.patch b/package/iperf3/0002-musl.patch
> new file mode 100644
> index 0000000..764c00b
> --- /dev/null
> +++ b/package/iperf3/0002-musl.patch
> @@ -0,0 +1,27 @@
> +Fix musl build
> +
> +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Really, I want to see Git formatted patches for packages hosted on Git
repositories upstream.
Could you rework things with this in mind ?
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-01-26 22:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-23 21:52 [Buildroot] [PATCH 1/2] package/iperf3: bump version to 3.1.1, switch upstream to github Bernd Kuhls
2016-01-23 21:52 ` [Buildroot] [PATCH 2/2] package/iperf3: fix musl build Bernd Kuhls
2016-01-26 22:00 ` Thomas Petazzoni
2016-01-26 21:58 ` [Buildroot] [PATCH 1/2] package/iperf3: bump version to 3.1.1, switch upstream to github Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.