From eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 Mon Sep 17 00:00:00 2001 From: Dave Cobbley Date: Tue, 14 Aug 2018 10:05:37 -0700 Subject: [Subtree] Removing import-layers directory As part of the move to subtrees, need to bring all the import layers content to the top level. Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f Signed-off-by: Dave Cobbley Signed-off-by: Brad Bishop --- .../0002-Remove-pg-from-profile_CFLAGS.patch | 31 ++++++++++++++++++++ .../iperf3/iperf3/automake-foreign.patch | 17 +++++++++++ .../meta-oe/recipes-benchmark/iperf3/iperf3_3.2.bb | 33 ++++++++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.2.bb (limited to 'meta-openembedded/meta-oe/recipes-benchmark/iperf3') diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch new file mode 100644 index 000000000..06eb41ac0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch @@ -0,0 +1,31 @@ +From 6db0e28f906bc3784019dfb5bb011237a8034fda Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 14 Jul 2017 13:00:16 -0700 +Subject: [PATCH 2/2] Remove -pg from profile_CFLAGS + +musl fails to link with missing gcrt1.o + +Signed-off-by: Khem Raj +--- + src/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 23b0c72..6268145 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -49,9 +49,9 @@ iperf3_LDFLAGS = -g + iperf3_profile_SOURCES = main.c \ + $(libiperf_la_SOURCES) + +-iperf3_profile_CFLAGS = -pg -g ++iperf3_profile_CFLAGS = -g + iperf3_profile_LDADD = libiperf.la +-iperf3_profile_LDFLAGS = -pg -g ++iperf3_profile_LDFLAGS = -g + + # Specify the sources and various flags for the test cases + t_timer_SOURCES = t_timer.c +-- +2.13.3 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch new file mode 100644 index 000000000..06c394e5c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch @@ -0,0 +1,17 @@ +Pass the 'foreign' option to automake to enable iperf3 to build. + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Chunrong Guo + +--- a/configure.ac 2015-10-19 02:49:30.471867352 -0500 ++++ b/configure.ac 2015-10-19 02:46:36.207873572 -0500 +@@ -33,7 +33,7 @@ + + + # Initialize the automake system +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE([foreign]) + AM_MAINTAINER_MODE + AM_CONFIG_HEADER(src/iperf_config.h) + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.2.bb b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.2.bb new file mode 100644 index 000000000..2ed08110f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.2.bb @@ -0,0 +1,33 @@ +SUMMARY = "Network benchmark tool" +DESCRIPTION = "\ +iperf is a tool for active measurements of the maximum achievable bandwidth \ +on IP networks. It supports tuning of various parameters related to timing, \ +protocols, and buffers. For each test it reports the bandwidth, loss, and \ +other parameters." +HOMEPAGE = "http://software.es.net/iperf/" +SECTION = "console/network" +BUGTRACKER = "https://github.com/esnet/iperf/issues" +AUTHOR = "ESNET , Lawrence Berkeley National Laboratory " +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d098223e44bdd19585315ee75cd9d2d7" + +DEPENDS = "openssl" + +SRC_URI = "git://github.com/esnet/iperf.git \ + file://automake-foreign.patch \ + file://0002-Remove-pg-from-profile_CFLAGS.patch \ + " + +SRCREV = "88d907f7fb58bfab5d086c5da60c922e1c582c92" + +S = "${WORKDIR}/git" + +inherit autotools + +PACKAGECONFIG[lksctp] = "ac_cv_header_netinet_sctp_h=yes,ac_cv_header_netinet_sctp_h=no,lksctp-tools" + +CFLAGS += "-D_GNU_SOURCE" + +EXTRA_OECONF = "--with-openssl=${RECIPE_SYSROOT}" + +BBCLASSEXTEND = "native" -- cgit v1.2.1