From 9dda6b52d577eb30806b62f198dfbe2945eb2461 Mon Sep 17 00:00:00 2001 From: GuangJie1 Date: Wed, 21 May 2025 14:31:31 +0800 Subject: [PATCH] basic apps --- Others/dnsmasq/2.91/24.03-lts-sp1/Dockerfile | 17 ++++++++++ Others/dnsmasq/meta.yml | 3 ++ Others/fio/3.40/24.03-lts-sp1/Dockerfile | 31 ++++++++++++++++++ Others/fio/meta.yml | 2 ++ Others/netperf/2.7.0/24.03-lts-sp1/Dockerfile | 32 +++++++++++++++++++ .../netperf-fix-multiple-definition.patch | 20 ++++++++++++ ...server-suppress-debug-log-by-default.patch | 25 +++++++++++++++ Others/netperf/meta.yml | 2 ++ 8 files changed, 132 insertions(+) create mode 100644 Others/dnsmasq/2.91/24.03-lts-sp1/Dockerfile create mode 100644 Others/dnsmasq/meta.yml create mode 100644 Others/fio/3.40/24.03-lts-sp1/Dockerfile create mode 100644 Others/fio/meta.yml create mode 100644 Others/netperf/2.7.0/24.03-lts-sp1/Dockerfile create mode 100644 Others/netperf/2.7.0/24.03-lts-sp1/netperf-fix-multiple-definition.patch create mode 100644 Others/netperf/2.7.0/24.03-lts-sp1/netserver-suppress-debug-log-by-default.patch create mode 100644 Others/netperf/meta.yml diff --git a/Others/dnsmasq/2.91/24.03-lts-sp1/Dockerfile b/Others/dnsmasq/2.91/24.03-lts-sp1/Dockerfile new file mode 100644 index 00000000..e00c8e47 --- /dev/null +++ b/Others/dnsmasq/2.91/24.03-lts-sp1/Dockerfile @@ -0,0 +1,17 @@ +ARG BASE=openeuler/openeuler:24.03-lts-sp1 +FROM ${BASE} as BUILDER +ARG VERSION=2.91 + +RUN dnf update -y \ + && dnf install -y wget gcc make libidn-devel nettle-devel ncurses-devel \ + && dnf clean all \ + && rm -rf /var/cache/dnf + +RUN wget https://thekelleys.org.uk/dnsmasq/dnsmasq-${VERSION}.tar.gz \ + && tar -xf dnsmasq-${VERSION}.tar.gz \ + && rm -f dnsmasq-${VERSION}.tar.gz \ + && cd dnsmasq-${VERSION} \ + && make -j$(nproc) \ + && make install + +CMD ["/usr/local/sbin/dnsmasq", "--help"] \ No newline at end of file diff --git a/Others/dnsmasq/meta.yml b/Others/dnsmasq/meta.yml new file mode 100644 index 00000000..de98bfc6 --- /dev/null +++ b/Others/dnsmasq/meta.yml @@ -0,0 +1,3 @@ +2.91-oe2403sp1: + path: 2.91/24.03-lts-sp1/Dockerfile + diff --git a/Others/fio/3.40/24.03-lts-sp1/Dockerfile b/Others/fio/3.40/24.03-lts-sp1/Dockerfile new file mode 100644 index 00000000..8196bba1 --- /dev/null +++ b/Others/fio/3.40/24.03-lts-sp1/Dockerfile @@ -0,0 +1,31 @@ +ARG BASE=openeuler/openeuler:24.03-lts-sp1 +FROM ${BASE} as BUILDER +ARG VERSION=3.40 + +RUN dnf update -y && \ + dnf install -y \ + wget \ + gcc \ + make \ + libaio-devel \ + cairo-devel \ + gtk3-devel \ + openssl-devel \ + curl-devel \ + zlib-devel \ + && dnf clean all \ + && rm -rf /var/cache/dnf/* + +WORKDIR /opt + +RUN wget https://github.com/axboe/fio/archive/refs/tags/fio-${VERSION}.tar.gz \ + && tar -zxvf fio-${VERSION}.tar.gz \ + && rm -f fio-${VERSION}.tar.gz + +WORKDIR /opt/fio-fio-${VERSION} + +RUN ./configure --prefix=/usr/local \ + && make -j$(nproc) \ + && make install + +CMD ["fio"] diff --git a/Others/fio/meta.yml b/Others/fio/meta.yml new file mode 100644 index 00000000..03eaffe7 --- /dev/null +++ b/Others/fio/meta.yml @@ -0,0 +1,2 @@ +3.40-oe2403sp1: + path: 3.40/24.03-lts-sp1/Dockerfile diff --git a/Others/netperf/2.7.0/24.03-lts-sp1/Dockerfile b/Others/netperf/2.7.0/24.03-lts-sp1/Dockerfile new file mode 100644 index 00000000..1d768a5f --- /dev/null +++ b/Others/netperf/2.7.0/24.03-lts-sp1/Dockerfile @@ -0,0 +1,32 @@ +ARG BASE=openeuler/openeuler:24.03-lts-sp1 +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-sp1/netperf-fix-multiple-definition.patch b/Others/netperf/2.7.0/24.03-lts-sp1/netperf-fix-multiple-definition.patch new file mode 100644 index 00000000..ee80975f --- /dev/null +++ b/Others/netperf/2.7.0/24.03-lts-sp1/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-sp1/netserver-suppress-debug-log-by-default.patch b/Others/netperf/2.7.0/24.03-lts-sp1/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-sp1/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/meta.yml b/Others/netperf/meta.yml new file mode 100644 index 00000000..362ba542 --- /dev/null +++ b/Others/netperf/meta.yml @@ -0,0 +1,2 @@ +2.7.0-oe2403sp1: + path: 2.7.0/24.03-lts-sp1/Dockerfile -- Gitee