From 48f8bae71cc18d91feb5782d08e027680413c1b9 Mon Sep 17 00:00:00 2001 From: openeuler_bot Date: Tue, 11 Nov 2025 00:13:49 +0000 Subject: [PATCH] 24.03-lts-sp2 update netperf to 2.7.0 --- Others/netperf/2.7.0/24.03-lts-sp2/Dockerfile | 32 +++++++++++++++++++ .../netperf-fix-multiple-definition.patch | 20 ++++++++++++ ...server-suppress-debug-log-by-default.patch | 25 +++++++++++++++ Others/netperf/README.md | 1 + Others/netperf/doc/image-info.yml | 3 +- Others/netperf/meta.yml | 3 ++ 6 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 Others/netperf/2.7.0/24.03-lts-sp2/Dockerfile create mode 100644 Others/netperf/2.7.0/24.03-lts-sp2/netperf-fix-multiple-definition.patch create mode 100644 Others/netperf/2.7.0/24.03-lts-sp2/netserver-suppress-debug-log-by-default.patch diff --git a/Others/netperf/2.7.0/24.03-lts-sp2/Dockerfile b/Others/netperf/2.7.0/24.03-lts-sp2/Dockerfile new file mode 100644 index 00000000..13916976 --- /dev/null +++ b/Others/netperf/2.7.0/24.03-lts-sp2/Dockerfile @@ -0,0 +1,32 @@ +ARG BASE=openeuler/openeuler:24.03-lts-sp2 +FROM ${BASE} +ARG TARGETARCH +ARG BUILDARCH +ARG VERSION=2.7.0 + +RUN dnf update -y \ + && dnf install -y wget make gcc autoconf automake libtool texinfo patch \ + && dnf clean all \ + && rm -rf /var/cache/dnf + +WORKDIR /opt + +COPY netperf-fix-multiple-definition.patch /opt/netperf-fix-multiple-definition.patch +COPY netserver-suppress-debug-log-by-default.patch /opt/netserver-suppress-debug-log-by-default.patch + +RUN if [ "$TARGETARCH" = "amd64" ]; then \ + BUILDARCH="x86_64-pc-linux-gnu"; \ + elif [ "$TARGETARCH" = "arm64" ]; then \ + BUILDARCH="aarch64-unknown-linux-gnu"; \ + fi; \ + wget https://github.com/HewlettPackard/netperf/archive/refs/tags/netperf-${VERSION}.tar.gz \ + && tar -zxvf netperf-${VERSION}.tar.gz \ + && rm -f netperf-${VERSION}.tar.gz \ + && cd netperf-netperf-${VERSION} \ + && patch -p1 < /opt/netperf-fix-multiple-definition.patch \ + && patch -p1 < /opt/netserver-suppress-debug-log-by-default.patch \ + && ./configure --build=${BUILDARCH} \ + && make -j $(nproc) \ + && make install + +CMD ["netperf", "--help"] \ No newline at end of file diff --git a/Others/netperf/2.7.0/24.03-lts-sp2/netperf-fix-multiple-definition.patch b/Others/netperf/2.7.0/24.03-lts-sp2/netperf-fix-multiple-definition.patch new file mode 100644 index 00000000..ee80975f --- /dev/null +++ b/Others/netperf/2.7.0/24.03-lts-sp2/netperf-fix-multiple-definition.patch @@ -0,0 +1,20 @@ +--- ./src/nettest_omni.c.bak 2021-08-03 17:12:46.083392014 +0800 ++++ ./src/nettest_omni.c 2021-08-03 17:13:38.299856016 +0800 +@@ -456,15 +456,13 @@ + + /* different options for the sockets */ + +-int ++extern int + loc_nodelay, /* don't/do use NODELAY locally */ + rem_nodelay, /* don't/do use NODELAY remotely */ + loc_sndavoid, /* avoid send copies locally */ + loc_rcvavoid, /* avoid recv copies locally */ + rem_sndavoid, /* avoid send copies remotely */ +- rem_rcvavoid; /* avoid recv_copies remotely */ +- +-extern int ++ rem_rcvavoid, /* avoid recv_copies remotely */ + loc_tcpcork, + rem_tcpcork, + local_connected, diff --git a/Others/netperf/2.7.0/24.03-lts-sp2/netserver-suppress-debug-log-by-default.patch b/Others/netperf/2.7.0/24.03-lts-sp2/netserver-suppress-debug-log-by-default.patch new file mode 100644 index 00000000..3d99ef25 --- /dev/null +++ b/Others/netperf/2.7.0/24.03-lts-sp2/netserver-suppress-debug-log-by-default.patch @@ -0,0 +1,25 @@ +From ef83b1fda6a95a675f60e4d01ecbdf9d4f9d7fd2 Mon Sep 17 00:00:00 2001 +From: Marcelo Ricardo Leitner +Date: Thu, 18 Apr 2024 21:01:19 +0800 +Subject: [PATCH] netserver: suppress debug log by default + +--- + src/netserver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git ./src/netserver.c ./src/netserver.c +index 9534722..b8b8c49 100644 +--- ./src/netserver.c ++++ ./src/netserver.c +@@ -196,7 +196,7 @@ int daemon_parent = 0; + int not_inetd; + int want_daemonize; + int spawn_on_accept; +-int suppress_debug = 0; ++int suppress_debug = 1; + + extern char *optarg; + extern int optind, opterr; +-- +2.27.0 + diff --git a/Others/netperf/README.md b/Others/netperf/README.md index 2fcd1836..146291fa 100644 --- a/Others/netperf/README.md +++ b/Others/netperf/README.md @@ -16,6 +16,7 @@ The tag of each `netperf` docker image is consist of the version of `netperf` an | Tag | Currently | Architectures | |----------|-------------|------------------| +|[2.7.0-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/netperf/2.7.0/24.03-lts-sp2/Dockerfile) | netperf 2.7.0 on openEuler 24.03-LTS-SP2 | amd64, arm64 | |[2.7.0-oe2403sp1](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/netperf/2.7.0/24.03-lts-sp1/Dockerfile)| netperf 2.7.0 on openEuler 24.03-LTS-SP1 | amd64, arm64 | # Usage diff --git a/Others/netperf/doc/image-info.yml b/Others/netperf/doc/image-info.yml index fbb595f1..b9be22a7 100644 --- a/Others/netperf/doc/image-info.yml +++ b/Others/netperf/doc/image-info.yml @@ -11,6 +11,7 @@ tags: | | Tag | Currently | Architectures | |----------|-------------|------------------| + |[2.7.0-oe2403sp2](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/netperf/2.7.0/24.03-lts-sp2/Dockerfile) | netperf 2.7.0 on openEuler 24.03-LTS-SP2 | amd64, arm64 | |[2.7.0-oe2403sp1](https://gitee.com/openeuler/openeuler-docker-images/blob/master/Others/netperf/2.7.0/24.03-lts-sp1/Dockerfile)| netperf 2.7.0 on openEuler 24.03-LTS-SP1 | amd64, arm64 | download: | @@ -42,4 +43,4 @@ similar_packages: - iperf: iperf 是一款网络性能测试工具，用于测量 带宽（Throughput） 和 延迟（Latency）。 dependency: - texinfo - - libtool + - libtool \ No newline at end of file diff --git a/Others/netperf/meta.yml b/Others/netperf/meta.yml index 362ba542..f2e74830 100644 --- a/Others/netperf/meta.yml +++ b/Others/netperf/meta.yml @@ -1,2 +1,5 @@ 2.7.0-oe2403sp1: path: 2.7.0/24.03-lts-sp1/Dockerfile + +2.7.0-oe2403sp2: + path: 2.7.0/24.03-lts-sp2/Dockerfile \ No newline at end of file -- Gitee