Skip to content

Commit faa1fa8

Browse files
dreibhdreibh
committed
Packaging improvements.
1 parent 7a378f1 commit faa1fa8

File tree

5 files changed

+180
-36
lines changed

5 files changed

+180
-36
lines changed

‎debian/control‎

Lines changed: 60 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ Architecture: any
2020
Depends: netperfmeter-common,
2121
${misc:Depends},
2222
${shlibs:Depends}
23-
Recommends: bc,
24-
hipercontracer,
23+
Recommends: hipercontracer,
2524
iproute2,
25+
netperfmeter-examples,
2626
netperfmeter-plotting,
2727
rsplib-tools,
2828
subnetcalc,
@@ -76,6 +76,33 @@ Description: Network Performance Meter (common files)
7676
.
7777
This package contains common NetPerfMeter files.
7878

79+
Package: netperfmeter-examples
80+
Architecture: all
81+
Depends: r-base-core,
82+
r-cran-data.table,
83+
r-cran-dplyr,
84+
r-cran-ggplot2,
85+
${misc:Depends}
86+
Description: Network Performance Meter (example scripts and files)
87+
NetPerfMeter is a network performance meter for the TCP, MPTCP, SCTP, UDP,
88+
and DCCP transport protocols over IPv4 and IPv6. It simultaneously transmits
89+
bidirectional flows to an endpoint and measures the resulting flow bandwidths
90+
and QoS. Flows can be saturated (i.e. “send as much as possible”) or
91+
non-saturated with frame rate and frame sizes (like a multimedia
92+
transmission). Non-saturated flows can be configured with constant or
93+
variable frame rate/frame size, i.e. to realise Constant Bit Rate (CBR) or
94+
Variable Bit Rate (VBR) traffic. For both, frame rate and frame size, it is
95+
not only possible to set constant values but to also to use random
96+
distributions. Furthermore, flows can be set up as on/off flows. Of course,
97+
the flow parameters can be configured individually per flow and flow
98+
direction. The measurement results can be recorded as scalar files (summary
99+
of the run) and vector files (time series). These files can be processed
100+
further, e.g. for detailed analysis and plotting of the results. The
101+
Wireshark network protocol analyser provides out-of-the-box support for
102+
analysing NetPerfMeter packet traffic.
103+
.
104+
This package contains some NetPerfMeter example scripts and results files.
105+
79106
Package: netperfmeter-service
80107
Architecture: all
81108
Depends: netperfmeter,
@@ -101,8 +128,7 @@ Description: Network Performance Meter (server service)
101128
Wireshark network protocol analyser provides out-of-the-box support for
102129
analysing NetPerfMeter packet traffic.
103130
.
104-
This package sets up a service running a NetPerfMeter
105-
server instance.
131+
This package sets up a service running a NetPerfMeter server instance.
106132

107133
Package: pdfproctools
108134
Architecture: all
@@ -124,6 +150,7 @@ Description: PDF Processing Tools
124150

125151
Package: netperfmeter-plotting
126152
Architecture: all
153+
Recommends: netperfmeter-examples
127154
Depends: pdfproctools,
128155
r-base,
129156
r-cran-data.table,
@@ -149,3 +176,32 @@ Description: Network Performance Meter (plotting program)
149176
analysing NetPerfMeter packet traffic.
150177
.
151178
This package contains a plotting program for the results.
179+
180+
Package: netperfmeter-all
181+
Architecture: all
182+
Depends: netperfmeter,
183+
netperfmeter-common,
184+
netperfmeter-examples,
185+
netperfmeter-plotting,
186+
netperfmeter-service,
187+
pdfproctools,
188+
${misc:Depends}
189+
Description: NetPerfMeter metapackage for all sub-packages
190+
NetPerfMeter is a network performance meter for the TCP, MPTCP, SCTP, UDP,
191+
and DCCP transport protocols over IPv4 and IPv6. It simultaneously transmits
192+
bidirectional flows to an endpoint and measures the resulting flow bandwidths
193+
and QoS. Flows can be saturated (i.e. “send as much as possible”) or
194+
non-saturated with frame rate and frame sizes (like a multimedia
195+
transmission). Non-saturated flows can be configured with constant or
196+
variable frame rate/frame size, i.e. to realise Constant Bit Rate (CBR) or
197+
Variable Bit Rate (VBR) traffic. For both, frame rate and frame size, it is
198+
not only possible to set constant values but to also to use random
199+
distributions. Furthermore, flows can be set up as on/off flows. Of course,
200+
the flow parameters can be configured individually per flow and flow
201+
direction. The measurement results can be recorded as scalar files (summary
202+
of the run) and vector files (time series). These files can be processed
203+
further, e.g. for detailed analysis and plotting of the results. The
204+
Wireshark network protocol analyser provides out-of-the-box support for
205+
analysing NetPerfMeter packet traffic.
206+
.
207+
This metapackage installs all sub-packages of NetPerfMeter.

‎debian/netperfmeter-common.install‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,3 @@ usr/share/mime/packages/netperfmeter.xml
44
usr/share/netperfmeter/netperfmeter.bib
55
usr/share/netperfmeter/netperfmeter.pdf
66
usr/share/netperfmeter/netperfmeter.png
7-
usr/share/netperfmeter/results-examples/*.pcap*
8-
usr/share/netperfmeter/results-examples/*.sca*
9-
usr/share/netperfmeter/results-examples/*.vec*

‎debian/netperfmeter-examples.install‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
usr/share/netperfmeter/plot-experiment1
2+
usr/share/netperfmeter/results-examples/*.pcap*
3+
usr/share/netperfmeter/results-examples/*.sca*
4+
usr/share/netperfmeter/results-examples/*.vec*
5+
usr/share/netperfmeter/run-experiment1

‎netperfmeter.examples‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
usr/share/netperfmeter/plot-experiment1
2+
usr/share/netperfmeter/run-experiment1

‎rpm/netperfmeter.spec‎

Lines changed: 113 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -19,34 +19,36 @@ BuildRequires: valgrind-devel
1919
BuildRoot: %{_tmppath}/%{name}-%{version}-build
2020

2121
Requires: %{name}-common = %{version}-%{release}
22+
Recommends: %{name}-examples = %{version}-%{release}
2223
Recommends: %{name}-plotting = %{version}-%{release}
23-
Recommends: bc
2424
Recommends: hipercontracer
2525
Recommends: iputils
2626
Recommends: wireshark-cli
27-
Recommends: subnetcalc >= 2.0.2
27+
Recommends: subnetcalc
2828
Suggests: %{name}-service = %{version}-%{release}
2929
Suggests: dynmhs
3030
Suggests: td-system-info
3131
Suggests: traceroute
3232

3333

3434
%description
35-
NetPerfMeter is a network performance meter for the TCP, MPTCP, SCTP, UDP, and
36-
DCCP transport protocols over IPv4 and IPv6. It simultaneously transmits
35+
NetPerfMeter is a network performance meter for the TCP, MPTCP, SCTP, UDP,
36+
and DCCP transport protocols over IPv4 and IPv6. It simultaneously transmits
3737
bidirectional flows to an endpoint and measures the resulting flow bandwidths
3838
and QoS. Flows can be saturated (i.e. “send as much as possible”) or
39-
non-saturated with frame rate and frame sizes (like a multimedia transmission).
40-
Non-saturated flows can be configured with constant or variable frame rate/frame
41-
size, i.e. to realise Constant Bit Rate (CBR) or Variable Bit Rate (VBR)
42-
traffic. For both, frame rate and frame size, it is not only possible to set
43-
constant values but to also to use random distributions. Furthermore, flows can
44-
be set up as on/off flows. Of course, the flow parameters can be configured
45-
individually per flow and flow direction. The measurement results can be
46-
recorded as scalar files (summary of the run) and vector files (time series).
47-
These files can be processed further, e.g. for detailed analysis and plotting of
48-
the results. The Wireshark network protocol analyser provides out-of-the-box
49-
support for analysing NetPerfMeter packet traffic.
39+
non-saturated with frame rate and frame sizes (like a multimedia
40+
transmission). Non-saturated flows can be configured with constant or
41+
variable frame rate/frame size, i.e. to realise Constant Bit Rate (CBR) or
42+
Variable Bit Rate (VBR) traffic. For both, frame rate and frame size, it is
43+
not only possible to set constant values but to also to use random
44+
distributions. Furthermore, flows can be set up as on/off flows. Of course,
45+
the flow parameters can be configured individually per flow and flow
46+
direction. The measurement results can be recorded as scalar files (summary
47+
of the run) and vector files (time series). These files can be processed
48+
further, e.g. for detailed analysis and plotting of the results. The
49+
Wireshark network protocol analyser provides out-of-the-box support for
50+
analysing NetPerfMeter packet traffic.
51+
This package contains the measurement program.
5052

5153
%prep
5254
%setup -q
@@ -100,16 +102,47 @@ further, e.g. for detailed analysis and plotting of the results. The
100102
Wireshark network protocol analyser provides out-of-the-box support for
101103
analysing NetPerfMeter packet traffic.
102104

105+
This package contains common NetPerfMeter files.
106+
103107
%files common
104108
%{_datadir}/icons/hicolor/*x*/apps/netperfmeter.png
105109
%{_datadir}/icons/hicolor/scalable/apps/netperfmeter.svg
106110
%{_datadir}/mime/packages/netperfmeter.xml
107111
%{_datadir}/netperfmeter/netperfmeter.bib
108112
%{_datadir}/netperfmeter/netperfmeter.pdf
109113
%{_datadir}/netperfmeter/netperfmeter.png
114+
115+
116+
%package examples
117+
Summary: Network Performance Meter (example scripts and files)
118+
Group: Applications/Internet
119+
BuildArch: noarch
120+
121+
%description examples
122+
NetPerfMeter is a network performance meter for the TCP, MPTCP, SCTP, UDP,
123+
and DCCP transport protocols over IPv4 and IPv6. It simultaneously transmits
124+
bidirectional flows to an endpoint and measures the resulting flow bandwidths
125+
and QoS. Flows can be saturated (i.e. “send as much as possible”) or
126+
non-saturated with frame rate and frame sizes (like a multimedia
127+
transmission). Non-saturated flows can be configured with constant or
128+
variable frame rate/frame size, i.e. to realise Constant Bit Rate (CBR) or
129+
Variable Bit Rate (VBR) traffic. For both, frame rate and frame size, it is
130+
not only possible to set constant values but to also to use random
131+
distributions. Furthermore, flows can be set up as on/off flows. Of course,
132+
the flow parameters can be configured individually per flow and flow
133+
direction. The measurement results can be recorded as scalar files (summary
134+
of the run) and vector files (time series). These files can be processed
135+
further, e.g. for detailed analysis and plotting of the results. The
136+
Wireshark network protocol analyser provides out-of-the-box support for
137+
analysing NetPerfMeter packet traffic.
138+
This package contains some NetPerfMeter example scripts and results files.
139+
140+
%files examples
141+
%{_datadir}/netperfmeter/plot-experiment1
110142
%{_datadir}/netperfmeter/results-examples/*.pcap*
111143
%{_datadir}/netperfmeter/results-examples/*.sca*
112144
%{_datadir}/netperfmeter/results-examples/*.vec*
145+
%{_datadir}/netperfmeter/run-experiment1
113146

114147

115148
%package service
@@ -122,14 +155,23 @@ Suggests: hipercontracer-trigger
122155
Suggests: td-system-tools
123156

124157
%description service
125-
NetPerfMeter is a network performance meter for the UDP,
126-
TCP, MPTCP, SCTP and DCCP transport protocols over IPv4 and IPv6.
127-
It simultaneously transmits bidirectional flows to an endpoint
128-
and measures the resulting flow bandwidths and QoS. The
129-
results are written as vector and scalar files. The vector
130-
files can e.g. be used to create plots of the results.
131-
This package sets up a service running a NetPerfMeter
132-
server instance.
158+
NetPerfMeter is a network performance meter for the TCP, MPTCP, SCTP, UDP,
159+
and DCCP transport protocols over IPv4 and IPv6. It simultaneously transmits
160+
bidirectional flows to an endpoint and measures the resulting flow bandwidths
161+
and QoS. Flows can be saturated (i.e. “send as much as possible”) or
162+
non-saturated with frame rate and frame sizes (like a multimedia
163+
transmission). Non-saturated flows can be configured with constant or
164+
variable frame rate/frame size, i.e. to realise Constant Bit Rate (CBR) or
165+
Variable Bit Rate (VBR) traffic. For both, frame rate and frame size, it is
166+
not only possible to set constant values but to also to use random
167+
distributions. Furthermore, flows can be set up as on/off flows. Of course,
168+
the flow parameters can be configured individually per flow and flow
169+
direction. The measurement results can be recorded as scalar files (summary
170+
of the run) and vector files (time series). These files can be processed
171+
further, e.g. for detailed analysis and plotting of the results. The
172+
Wireshark network protocol analyser provides out-of-the-box support for
173+
analysing NetPerfMeter packet traffic.
174+
This package sets up a service running a NetPerfMeter server instance.
133175

134176
%files service
135177
%{_prefix}/lib/systemd/system/netperfmeter.service
@@ -171,14 +213,25 @@ Requires: R-core
171213
Requires: R-data.table
172214
Requires: R-dplyr
173215
Requires: R-ggplot2
216+
Recommends: %{name}-examples = %{version}-%{release}
174217

175218
%description plotting
176-
NetPerfMeter is a network performance meter for the UDP,
177-
TCP, MPTCP, SCTP and DCCP transport protocols over IPv4 and IPv6.
178-
It simultaneously transmits bidirectional flows to an endpoint
179-
and measures the resulting flow bandwidths and QoS. The
180-
results are written as vector and scalar files. The vector
181-
files can e.g. be used to create plots of the results.
219+
NetPerfMeter is a network performance meter for the TCP, MPTCP, SCTP, UDP,
220+
and DCCP transport protocols over IPv4 and IPv6. It simultaneously transmits
221+
bidirectional flows to an endpoint and measures the resulting flow bandwidths
222+
and QoS. Flows can be saturated (i.e. “send as much as possible”) or
223+
non-saturated with frame rate and frame sizes (like a multimedia
224+
transmission). Non-saturated flows can be configured with constant or
225+
variable frame rate/frame size, i.e. to realise Constant Bit Rate (CBR) or
226+
Variable Bit Rate (VBR) traffic. For both, frame rate and frame size, it is
227+
not only possible to set constant values but to also to use random
228+
distributions. Furthermore, flows can be set up as on/off flows. Of course,
229+
the flow parameters can be configured individually per flow and flow
230+
direction. The measurement results can be recorded as scalar files (summary
231+
of the run) and vector files (time series). These files can be processed
232+
further, e.g. for detailed analysis and plotting of the results. The
233+
Wireshark network protocol analyser provides out-of-the-box support for
234+
analysing NetPerfMeter packet traffic.
182235
This package contains a plotting program for the results.
183236

184237
%files plotting
@@ -188,6 +241,37 @@ This package contains a plotting program for the results.
188241
%{_mandir}/man1/plot-netperfmeter-results.1.gz
189242

190243

244+
%package all
245+
Summary: NetPerfMeter metapackage for all sub-packages
246+
Group: Applications/Internet
247+
BuildArch: noarch
248+
Requires: %{name} = %{version}-%{release}
249+
Requires: %{name}-common = %{version}-%{release}
250+
Requires: %{name}-examples = %{version}-%{release}
251+
Requires: %{name}-plotting = %{version}-%{release}
252+
Requires: %{name}-pdfproctools = %{version}-%{release}
253+
Requires: %{name}-service = %{version}-%{release}
254+
255+
%description all
256+
NetPerfMeter is a network performance meter for the TCP, MPTCP, SCTP, UDP,
257+
and DCCP transport protocols over IPv4 and IPv6. It simultaneously transmits
258+
bidirectional flows to an endpoint and measures the resulting flow bandwidths
259+
and QoS. Flows can be saturated (i.e. “send as much as possible”) or
260+
non-saturated with frame rate and frame sizes (like a multimedia
261+
transmission). Non-saturated flows can be configured with constant or
262+
variable frame rate/frame size, i.e. to realise Constant Bit Rate (CBR) or
263+
Variable Bit Rate (VBR) traffic. For both, frame rate and frame size, it is
264+
not only possible to set constant values but to also to use random
265+
distributions. Furthermore, flows can be set up as on/off flows. Of course,
266+
the flow parameters can be configured individually per flow and flow
267+
direction. The measurement results can be recorded as scalar files (summary
268+
of the run) and vector files (time series). These files can be processed
269+
further, e.g. for detailed analysis and plotting of the results. The
270+
Wireshark network protocol analyser provides out-of-the-box support for
271+
analysing NetPerfMeter packet traffic.
272+
This metapackage installs all sub-packages of NetPerfMeter.
273+
274+
191275
%changelog
192276
* Sat Feb 10 2024 Thomas Dreibholz <thomas.dreibholz@gmail.com> - 1.9.7
193277
- New upstream release.

0 commit comments

Comments
 (0)