From 089dc53bb7956c08161fa099848030e7f52cadb7 Mon Sep 17 00:00:00 2001 From: Mark Feit Date: Fri, 14 Jun 2024 12:14:09 +0000 Subject: [PATCH] Add iperf3 for u22 #1441 --- .../unibuild-packaging/deb/compat-Ubuntu-22 | 1 + .../unibuild-packaging/deb/control-Ubuntu-22 | 51 +++++++++++++++++++ iperf3/unibuild-packaging/deb/rules-Ubuntu-22 | 15 ++++++ unibuild-order | 3 +- 4 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 iperf3/unibuild-packaging/deb/compat-Ubuntu-22 create mode 100644 iperf3/unibuild-packaging/deb/control-Ubuntu-22 create mode 100755 iperf3/unibuild-packaging/deb/rules-Ubuntu-22 diff --git a/iperf3/unibuild-packaging/deb/compat-Ubuntu-22 b/iperf3/unibuild-packaging/deb/compat-Ubuntu-22 new file mode 100644 index 0000000000..f599e28b8a --- /dev/null +++ b/iperf3/unibuild-packaging/deb/compat-Ubuntu-22 @@ -0,0 +1 @@ +10 diff --git a/iperf3/unibuild-packaging/deb/control-Ubuntu-22 b/iperf3/unibuild-packaging/deb/control-Ubuntu-22 new file mode 100644 index 0000000000..6ee240af85 --- /dev/null +++ b/iperf3/unibuild-packaging/deb/control-Ubuntu-22 @@ -0,0 +1,51 @@ +Source: iperf3 +Section: net +Priority: optional +Maintainer: perfSONAR developers +Uploaders: Antoine Delvaux +Build-Depends: debhelper (>= 10), libssl-dev, libsctp-dev [linux-any] +Standards-Version: 3.9.8 +Homepage: http://software.es.net/iperf/ + +Package: iperf3 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Internet Protocol bandwidth measuring tool + Iperf3 is a tool for performing network throughput measurements. It can + test either TCP or UDP throughput. + . + This is a new implementation that shares no code with the original + iperf from NLANR/DAST and also is not backwards compatible. + . + This package contains the command line utility. + +Package: libiperf0 +Architecture: any +Section: libs +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Internet Protocol bandwidth measuring tool (runtime files) + Iperf3 is a tool for performing network throughput measurements. It can + test either TCP or UDP throughput. + . + This is a new implementation that shares no code with the original + iperf from NLANR/DAST and also is not backwards compatible. + . + This is the runtime package for programs that use the shared iperf + library. + +Package: libiperf-dev +Architecture: any +Section: libdevel +Multi-Arch: same +Depends: libiperf0 (= ${binary:Version}), ${misc:Depends} +Description: Internet Protocol bandwidth measuring tool (development files) + Iperf3 is a tool for performing network throughput measurements. It can + test either TCP or UDP throughput. + . + This is a new implementation that shares no code with the original + iperf from NLANR/DAST and also is not backwards compatible. + . + This is the development package which contains headers files and the + static iperf library. diff --git a/iperf3/unibuild-packaging/deb/rules-Ubuntu-22 b/iperf3/unibuild-packaging/deb/rules-Ubuntu-22 new file mode 100755 index 0000000000..e19bd949d5 --- /dev/null +++ b/iperf3/unibuild-packaging/deb/rules-Ubuntu-22 @@ -0,0 +1,15 @@ +#!/usr/bin/make -f + +export DH_OPTIONS + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +override_dh_installchangelogs: + dh_installchangelogs RELNOTES.md + +%: + dh $@ + +# Ubuntu dbgsym.ddeb are currently not supported by reprepro +override_dh_strip: + dh_strip --no-automatic-dbgsym diff --git a/unibuild-order b/unibuild-order index c8d0cf5fed..f3f4f14814 100755 --- a/unibuild-order +++ b/unibuild-order @@ -127,8 +127,7 @@ iperf # TODO: Need to look at the Debian/Ubuntus and see what we can consolidate. ifelse(FAMILY/eval(MAJOR == 12),Debian/1,iperf3, # We only want iperf3 on D12 - DISTRO/eval(MAJOR == 20),Ubuntu/1,iperf3, # and U20 - DISTRO/eval(MAJOR == 24),Ubuntu/1,iperf3, # and U24 + DISTRO/eval(MAJOR >= 20),Ubuntu/1,iperf3, # and U20+ FAMILY,Debian,, iperf3) nuttcp