* [meta-oe][PATCH 1/2] Revert "iperf: remove depricated package"
@ 2017-12-18 14:01 Ioan-Adrian Ratiu
2017-12-18 14:01 ` [meta-oe][PATCH 2/2] iperf: rename to iperf2 and bump 2.0.5 -> 2.0.10 Ioan-Adrian Ratiu
0 siblings, 1 reply; 5+ messages in thread
From: Ioan-Adrian Ratiu @ 2017-12-18 14:01 UTC (permalink / raw)
To: openembedded-devel
This reverts commit 2b6cad9522582b0816251b5efbbc4601d037ae0e.
iperf3 is a complete rewrite which does not have full parity with
iperf2 and in some cases it's intentionally backwards incompatble so
moving to iperf3 is not possible for everyone. That's why the project
got forked.
These recipes/packages can live side by side because their projects
are now independent (separate codebases and maintainers).
Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
---
.../iperf-2.0.5/0001-fix-out-of-tree-config.patch | 52 ++++++++++++++++++++++
.../iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch | 16 +++++++
.../iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch | 8 ++++
meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb | 23 ++++++++++
4 files changed, 99 insertions(+)
create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch
create mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch
create mode 100755 meta-oe/recipes-benchmark/iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch
create mode 100644 meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb
diff --git a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch b/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch
new file mode 100644
index 000000000..e8a029790
--- /dev/null
+++ b/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch
@@ -0,0 +1,52 @@
+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
diff --git a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch b/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch
new file mode 100644
index 000000000..348e316ce
--- /dev/null
+++ b/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch
@@ -0,0 +1,16 @@
+--- 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
diff --git a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch b/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch
new file mode 100755
index 000000000..12e8f4631
--- /dev/null
+++ b/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch
@@ -0,0 +1,8 @@
+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
diff --git a/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb b/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb
new file mode 100644
index 000000000..9981d8275
--- /dev/null
+++ b/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb
@@ -0,0 +1,23 @@
+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,"
--
2.15.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [meta-oe][PATCH 2/2] iperf: rename to iperf2 and bump 2.0.5 -> 2.0.10
2017-12-18 14:01 [meta-oe][PATCH 1/2] Revert "iperf: remove depricated package" Ioan-Adrian Ratiu
@ 2017-12-18 14:01 ` Ioan-Adrian Ratiu
2017-12-27 3:09 ` akuster808
0 siblings, 1 reply; 5+ messages in thread
From: Ioan-Adrian Ratiu @ 2017-12-18 14:01 UTC (permalink / raw)
To: openembedded-devel
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>
---
.../iperf-2.0.5/0001-fix-out-of-tree-config.patch | 52 ----------------------
.../iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch | 16 -------
.../iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch | 8 ----
meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb | 23 ----------
meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb | 19 ++++++++
5 files changed, 19 insertions(+), 99 deletions(-)
delete mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch
delete mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch
delete mode 100755 meta-oe/recipes-benchmark/iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch
delete mode 100644 meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb
create mode 100644 meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb
diff --git a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch b/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch
deleted file mode 100644
index e8a029790..000000000
--- a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch
+++ /dev/null
@@ -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
diff --git a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch b/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch
deleted file mode 100644
index 348e316ce..000000000
--- a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch
+++ /dev/null
@@ -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
diff --git a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch b/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch
deleted file mode 100755
index 12e8f4631..000000000
--- a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch
+++ /dev/null
@@ -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
diff --git a/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb b/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb
deleted file mode 100644
index 9981d8275..000000000
--- a/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb
+++ /dev/null
@@ -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,"
diff --git a/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb b/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb
new file mode 100644
index 000000000..1322d0788
--- /dev/null
+++ b/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb
@@ -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,"
--
2.15.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH 2/2] iperf: rename to iperf2 and bump 2.0.5 -> 2.0.10
2017-12-18 14:01 ` [meta-oe][PATCH 2/2] iperf: rename to iperf2 and bump 2.0.5 -> 2.0.10 Ioan-Adrian Ratiu
@ 2017-12-27 3:09 ` akuster808
2017-12-27 23:46 ` Ioan-Adrian Ratiu
2017-12-27 23:48 ` Ioan-Adrian Ratiu
0 siblings, 2 replies; 5+ messages in thread
From: akuster808 @ 2017-12-27 3:09 UTC (permalink / raw)
To: Ioan-Adrian Ratiu, openembedded-devel
On 12/18/2017 06:01 AM, Ioan-Adrian Ratiu wrote:
> 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.
I am seeing these error on arm.
| In file included from ../../iperf-2.0.10/compat/string.c:54:0:
| ../../iperf-2.0.10/include/util.h:73:1: error: unknown type name 'bool'; did you mean '_Bool'?
| bool setsock_blocking(int fd, bool blocking);
| ^~~~
| _Bool
| ../../iperf-2.0.10/include/util.h:73:31: error: unknown type name 'bool'; did you mean '_Bool'?
| bool setsock_blocking(int fd, bool blocking);
| ^~~~
| _Bool
| In file included from ../../iperf-2.0.10/compat/delay.c:55:0:
| ../../iperf-2.0.10/include/util.h:73:1: error: unknown type name 'bool'; did you mean '_Bool'?
| bool setsock_blocking(int fd, bool blocking);
| ^~~~
| _Bool
| ../../iperf-2.0.10/include/util.h:73:31: error: unknown type name 'bool'; did you mean '_Bool'?
| bool setsock_blocking(int fd, bool blocking);
Could the removed patch: 0002-fix-bool-size-m4.patch be needed?
- armin
>
> Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
> ---
> .../iperf-2.0.5/0001-fix-out-of-tree-config.patch | 52 ----------------------
> .../iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch | 16 -------
> .../iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch | 8 ----
> meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb | 23 ----------
> meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb | 19 ++++++++
> 5 files changed, 19 insertions(+), 99 deletions(-)
> delete mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch
> delete mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch
> delete mode 100755 meta-oe/recipes-benchmark/iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch
> delete mode 100644 meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb
> create mode 100644 meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb
>
> diff --git a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch b/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch
> deleted file mode 100644
> index e8a029790..000000000
> --- a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch
> +++ /dev/null
> @@ -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
> diff --git a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch b/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch
> deleted file mode 100644
> index 348e316ce..000000000
> --- a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch
> +++ /dev/null
> @@ -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
> diff --git a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch b/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch
> deleted file mode 100755
> index 12e8f4631..000000000
> --- a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch
> +++ /dev/null
> @@ -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
> diff --git a/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb b/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb
> deleted file mode 100644
> index 9981d8275..000000000
> --- a/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb
> +++ /dev/null
> @@ -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,"
> diff --git a/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb b/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb
> new file mode 100644
> index 000000000..1322d0788
> --- /dev/null
> +++ b/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb
> @@ -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,"
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH 2/2] iperf: rename to iperf2 and bump 2.0.5 -> 2.0.10
2017-12-27 3:09 ` akuster808
@ 2017-12-27 23:46 ` Ioan-Adrian Ratiu
2017-12-27 23:48 ` Ioan-Adrian Ratiu
1 sibling, 0 replies; 5+ messages in thread
From: Ioan-Adrian Ratiu @ 2017-12-27 23:46 UTC (permalink / raw)
To: akuster808, openembedded-devel
On Tue, 26 Dec 2017, akuster808 <akuster808@gmail.com> wrote:
> On 12/18/2017 06:01 AM, Ioan-Adrian Ratiu wrote:
>> 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.
>
> I am seeing these error on arm.
I have a patch for these errors pending in OE-core. It removes a
hardcoded value for sizeof(bool) which triggers this error on ARM, so
ideally the oe-core fix should be pulled before these patches.
>
> | In file included from ../../iperf-2.0.10/compat/string.c:54:0:
> | ../../iperf-2.0.10/include/util.h:73:1: error: unknown type name 'bool'; did you mean '_Bool'?
> | bool setsock_blocking(int fd, bool blocking);
> | ^~~~
> | _Bool
> | ../../iperf-2.0.10/include/util.h:73:31: error: unknown type name 'bool'; did you mean '_Bool'?
> | bool setsock_blocking(int fd, bool blocking);
> | ^~~~
> | _Bool
> | In file included from ../../iperf-2.0.10/compat/delay.c:55:0:
> | ../../iperf-2.0.10/include/util.h:73:1: error: unknown type name 'bool'; did you mean '_Bool'?
> | bool setsock_blocking(int fd, bool blocking);
> | ^~~~
> | _Bool
> | ../../iperf-2.0.10/include/util.h:73:31: error: unknown type name 'bool'; did you mean '_Bool'?
> | bool setsock_blocking(int fd, bool blocking);
>
>
> Could the removed patch: 0002-fix-bool-size-m4.patch be needed?
Nope. We just need to arm site file path in oe-core.
>
> - armin
>
>>
>> Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
>> ---
>> .../iperf-2.0.5/0001-fix-out-of-tree-config.patch | 52 ----------------------
>> .../iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch | 16 -------
>> .../iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch | 8 ----
>> meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb | 23 ----------
>> meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb | 19 ++++++++
>> 5 files changed, 19 insertions(+), 99 deletions(-)
>> delete mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch
>> delete mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch
>> delete mode 100755 meta-oe/recipes-benchmark/iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch
>> delete mode 100644 meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb
>> create mode 100644 meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb
>>
>> diff --git a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch b/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch
>> deleted file mode 100644
>> index e8a029790..000000000
>> --- a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch
>> +++ /dev/null
>> @@ -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
>> diff --git a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch b/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch
>> deleted file mode 100644
>> index 348e316ce..000000000
>> --- a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch
>> +++ /dev/null
>> @@ -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
>> diff --git a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch b/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch
>> deleted file mode 100755
>> index 12e8f4631..000000000
>> --- a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch
>> +++ /dev/null
>> @@ -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
>> diff --git a/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb b/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb
>> deleted file mode 100644
>> index 9981d8275..000000000
>> --- a/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb
>> +++ /dev/null
>> @@ -1,23 +0,0 @@
>> -DESCRIPTION = "Iperf is a tool to measure maximum TCP bandwidth, allowing the tuning of various parameters and UDP characteristics"
>> -HOMEPAGE = "https://urldefense.proofpoint.com/v2/url?u=http-3A__dast.nlanr.net_Projects_Iperf_&d=DwICaQ&c=I_0YwoKy7z5LMTVdyO6YCiE2uzI1jjZZuIPelcSjixA&r=fzwh7IUt7VYYiD6094geII0kSDP3DkEnN0B8zB62AxE&m=50XFeLkyJYPBWjDGGzP76L5zyicMgYI3oFnzHMmJMyc&s=HHOEfIX6EP4CjawtZdH5r5C-_Jy4GNhDSmti1UGdq20&e="
>> -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,"
>> diff --git a/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb b/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb
>> new file mode 100644
>> index 000000000..1322d0788
>> --- /dev/null
>> +++ b/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb
>> @@ -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://urldefense.proofpoint.com/v2/url?u=https-3A__sourceforge.net_projects_iperf2_&d=DwICaQ&c=I_0YwoKy7z5LMTVdyO6YCiE2uzI1jjZZuIPelcSjixA&r=fzwh7IUt7VYYiD6094geII0kSDP3DkEnN0B8zB62AxE&m=50XFeLkyJYPBWjDGGzP76L5zyicMgYI3oFnzHMmJMyc&s=XRq46sNKPefK1TwfB1sv_G5f4uOy3757qzsYT0eEr8g&e="
>> +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,"
National Instruments Romania S.R.L.
------------------------------------------------------
B-dul 21 Decembrie 1989, nr. 77, A2
Cluj-Napoca 400604, Romania
C.I.F.: RO17961616 | O.R.C.: J12/3337/2005
Telefon: +40 264 406428 | Fax: +40 264 406429
E-mail: office.cluj@ni.com
Web: romania.ni.com
Vanzari si suport tehnic:
Telefon gratuit : 0800 070071
E-mail vanzari: ni.romania@ni.com
E-mail suport tehnic: techsupport@ni.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH 2/2] iperf: rename to iperf2 and bump 2.0.5 -> 2.0.10
2017-12-27 3:09 ` akuster808
2017-12-27 23:46 ` Ioan-Adrian Ratiu
@ 2017-12-27 23:48 ` Ioan-Adrian Ratiu
1 sibling, 0 replies; 5+ messages in thread
From: Ioan-Adrian Ratiu @ 2017-12-27 23:48 UTC (permalink / raw)
To: akuster808, openembedded-devel
Oh I forgot the link to the OE-core fix in my previous mail :)
http://lists.openembedded.org/pipermail/openembedded-core/2017-December/145741.html
On Tue, 26 Dec 2017, akuster808 <akuster808@gmail.com> wrote:
> On 12/18/2017 06:01 AM, Ioan-Adrian Ratiu wrote:
>> 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.
>
> I am seeing these error on arm.
>
> | In file included from ../../iperf-2.0.10/compat/string.c:54:0:
> | ../../iperf-2.0.10/include/util.h:73:1: error: unknown type name 'bool'; did you mean '_Bool'?
> | bool setsock_blocking(int fd, bool blocking);
> | ^~~~
> | _Bool
> | ../../iperf-2.0.10/include/util.h:73:31: error: unknown type name 'bool'; did you mean '_Bool'?
> | bool setsock_blocking(int fd, bool blocking);
> | ^~~~
> | _Bool
> | In file included from ../../iperf-2.0.10/compat/delay.c:55:0:
> | ../../iperf-2.0.10/include/util.h:73:1: error: unknown type name 'bool'; did you mean '_Bool'?
> | bool setsock_blocking(int fd, bool blocking);
> | ^~~~
> | _Bool
> | ../../iperf-2.0.10/include/util.h:73:31: error: unknown type name 'bool'; did you mean '_Bool'?
> | bool setsock_blocking(int fd, bool blocking);
>
>
> Could the removed patch: 0002-fix-bool-size-m4.patch be needed?
>
> - armin
>
>>
>> Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
>> ---
>> .../iperf-2.0.5/0001-fix-out-of-tree-config.patch | 52 ----------------------
>> .../iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch | 16 -------
>> .../iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch | 8 ----
>> meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb | 23 ----------
>> meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb | 19 ++++++++
>> 5 files changed, 19 insertions(+), 99 deletions(-)
>> delete mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch
>> delete mode 100644 meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch
>> delete mode 100755 meta-oe/recipes-benchmark/iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch
>> delete mode 100644 meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb
>> create mode 100644 meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb
>>
>> diff --git a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch b/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch
>> deleted file mode 100644
>> index e8a029790..000000000
>> --- a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch
>> +++ /dev/null
>> @@ -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
>> diff --git a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch b/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch
>> deleted file mode 100644
>> index 348e316ce..000000000
>> --- a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch
>> +++ /dev/null
>> @@ -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
>> diff --git a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch b/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch
>> deleted file mode 100755
>> index 12e8f4631..000000000
>> --- a/meta-oe/recipes-benchmark/iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch
>> +++ /dev/null
>> @@ -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
>> diff --git a/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb b/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb
>> deleted file mode 100644
>> index 9981d8275..000000000
>> --- a/meta-oe/recipes-benchmark/iperf/iperf_2.0.5.bb
>> +++ /dev/null
>> @@ -1,23 +0,0 @@
>> -DESCRIPTION = "Iperf is a tool to measure maximum TCP bandwidth, allowing the tuning of various parameters and UDP characteristics"
>> -HOMEPAGE = "https://urldefense.proofpoint.com/v2/url?u=http-3A__dast.nlanr.net_Projects_Iperf_&d=DwICaQ&c=I_0YwoKy7z5LMTVdyO6YCiE2uzI1jjZZuIPelcSjixA&r=fzwh7IUt7VYYiD6094geII0kSDP3DkEnN0B8zB62AxE&m=50XFeLkyJYPBWjDGGzP76L5zyicMgYI3oFnzHMmJMyc&s=HHOEfIX6EP4CjawtZdH5r5C-_Jy4GNhDSmti1UGdq20&e="
>> -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,"
>> diff --git a/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb b/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb
>> new file mode 100644
>> index 000000000..1322d0788
>> --- /dev/null
>> +++ b/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb
>> @@ -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://urldefense.proofpoint.com/v2/url?u=https-3A__sourceforge.net_projects_iperf2_&d=DwICaQ&c=I_0YwoKy7z5LMTVdyO6YCiE2uzI1jjZZuIPelcSjixA&r=fzwh7IUt7VYYiD6094geII0kSDP3DkEnN0B8zB62AxE&m=50XFeLkyJYPBWjDGGzP76L5zyicMgYI3oFnzHMmJMyc&s=XRq46sNKPefK1TwfB1sv_G5f4uOy3757qzsYT0eEr8g&e="
>> +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,"
National Instruments Romania S.R.L.
------------------------------------------------------
B-dul 21 Decembrie 1989, nr. 77, A2
Cluj-Napoca 400604, Romania
C.I.F.: RO17961616 | O.R.C.: J12/3337/2005
Telefon: +40 264 406428 | Fax: +40 264 406429
E-mail: office.cluj@ni.com
Web: romania.ni.com
Vanzari si suport tehnic:
Telefon gratuit : 0800 070071
E-mail vanzari: ni.romania@ni.com
E-mail suport tehnic: techsupport@ni.com
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-12-27 22:13 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-18 14:01 [meta-oe][PATCH 1/2] Revert "iperf: remove depricated package" Ioan-Adrian Ratiu
2017-12-18 14:01 ` [meta-oe][PATCH 2/2] iperf: rename to iperf2 and bump 2.0.5 -> 2.0.10 Ioan-Adrian Ratiu
2017-12-27 3:09 ` akuster808
2017-12-27 23:46 ` Ioan-Adrian Ratiu
2017-12-27 23:48 ` Ioan-Adrian Ratiu
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.