@@ -23,13 +23,13 @@ UTILS = " \
ethtool \
pciutils \
stress-ng \
- iperf \
+ iperf3 \
lmbench \
usbutils \
devmem2 \
phytool \
"
-
+
UTILS:append:ti-soc = " \
mtd-utils-ubifs-tests \
"
deleted file mode 100644
@@ -1,54 +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.
-
-Upstream-Status: Inappropriate [oe specific]
-
-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
deleted file mode 100644
@@ -1,42 +0,0 @@
-From c9d104a51f4f62e157f01e1fd47f534aa22a9d81 Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko <denys@ti.com>
-Date: Tue, 26 Jun 2018 15:55:31 -0400
-Subject: [PATCH] headers.h: remove math.h include that breaks aarch64
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-| In file included from .../aarch64-linux-gnu/include/c++/7.2.1/cmath:42:0,
-| from .../aarch64-linux-gnu/include/c++/7.2.1/math.h:36,
-| from ../../iperf-2.0.5/include/headers.h:85,
-| from ../../iperf-2.0.5/include/Timestamp.hpp:63,
-| from ../../iperf-2.0.5/compat/delay.cpp:53:
-| .../aarch64-linux-gnu/include/c++/7.2.1/bits/cpp_type_traits.h:205:12: error: redefinition of ‘struct std::__is_integer<int>’
-| struct __is_integer<int>
-| ^~~~~~~~~~~~~~~~~
-| .../aarch64-linux-gnu/include/c++/7.2.1/bits/cpp_type_traits.h:138:12: note: previous definition of ‘struct std::__is_integer<int>’
-| struct __is_integer<bool>
-| ^~~~~~~~~~~~~~~~~~
-
-Upstream-Status: Inappropriate [oe specific]
-
-Signed-off-by: Denys Dmytriyenko <denys@ti.com>
----
- include/headers.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/include/headers.h b/include/headers.h
-index 4667bfe..7e5efd7 100644
---- a/include/headers.h
-+++ b/include/headers.h
-@@ -82,7 +82,6 @@
- #include <errno.h>
- #include <string.h>
- #include <time.h>
--#include <math.h>
-
- #ifdef WIN32
-
-2.7.4
-
deleted file mode 100644
@@ -1,19 +0,0 @@
-
-Upstream-Status: Pending
-
---- 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
deleted file mode 100755
@@ -1,10 +0,0 @@
-Upstream-Status: Inappropriate [arago specific]
-
-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
deleted file mode 100644
@@ -1,23 +0,0 @@
-SUMMARY = "Tool to measure maximum TCP bandwidth and allow parameter tuning"
-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 \
- file://0001-headers.h-remove-math.h-include-that-breaks-aarch64.patch \
- "
-
-SRC_URI[md5sum] = "44b5536b67719f4250faed632a3cd016"
-SRC_URI[sha256sum] = "636b4eff0431cea80667ea85a67ce4c68698760a9837e1e9d13096d20362265b"
-
-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,"
We missed this when we moved to iperf3 a while back. Fix the last reference in packagegroup-arago-bootstrap and remove the iperf recipe. Signed-off-by: Ryan Eatmon <reatmon@ti.com> --- .../packagegroup-arago-bootstrap.bb | 4 +- .../0001-fix-out-of-tree-config.patch | 54 ------------------- ...e-math.h-include-that-breaks-aarch64.patch | 42 --------------- .../iperf-2.0.5/0002-fix-bool-size-m4.patch | 19 ------- .../iperf-2.0.5/iperf-2.0.5_ManPage.patch | 10 ---- .../recipes-benchmark/iperf/iperf_2.0.5.bb | 23 -------- 6 files changed, 2 insertions(+), 150 deletions(-) delete mode 100644 meta-arago-test/recipes-benchmark/iperf/iperf-2.0.5/0001-fix-out-of-tree-config.patch delete mode 100644 meta-arago-test/recipes-benchmark/iperf/iperf-2.0.5/0001-headers.h-remove-math.h-include-that-breaks-aarch64.patch delete mode 100644 meta-arago-test/recipes-benchmark/iperf/iperf-2.0.5/0002-fix-bool-size-m4.patch delete mode 100755 meta-arago-test/recipes-benchmark/iperf/iperf-2.0.5/iperf-2.0.5_ManPage.patch delete mode 100644 meta-arago-test/recipes-benchmark/iperf/iperf_2.0.5.bb