Explicitly depend on version-matched plugins in native packages. (#15861)
* Explicitly depend on version-matched plugins in native packages. This should allow in-place downgrades of our native packages, starting from versions after this change is introduced. * Fix deps in Debian control file.
Austin S. Hemmelgarn committed
Aug 22, 2023 at 06:45 UTC
ebf521102476e4f9efbd017596ff70f48364b12e
2 files changed
+26
-25
contrib/debian/control
+12
-12
@@ -36,15 +36,15 @@ Architecture: any
36
Depends: openssl,
37
${misc:Depends},
38
${shlibs:Depends},
39
- netdata-plugin-ebpf [amd64],
40
- netdata-plugin-apps,
41
- netdata-plugin-pythond,
42
- netdata-plugin-go,
43
- netdata-plugin-debugfs,
44
- netdata-plugin-nfacct,
45
- netdata-plugin-chartsd,
46
- netdata-plugin-slabinfo,
47
- netdata-plugin-perf
39
+ netdata-plugin-ebpf (= ${source:Version}) [amd64],
40
+ netdata-plugin-apps (= ${source:Version}),
41
+ netdata-plugin-pythond (= ${source:Version}),
42
+ netdata-plugin-go (= ${source:Version}),
43
+ netdata-plugin-debugfs (= ${source:Version}),
44
+ netdata-plugin-nfacct (= ${source:Version}),
45
+ netdata-plugin-chartsd (= ${source:Version}),
46
+ netdata-plugin-slabinfo (= ${source:Version}),
47
+ netdata-plugin-perf (= ${source:Version})
48
Pre-Depends: adduser,
49
dpkg (>= 1.17.14),
50
libcap2-bin (>=1:2.0),
@@ -53,9 +53,9 @@ Conflicts: netdata-core,
53
netdata-plugins-bash,
54
netdata-plugins-python,
55
netdata-web
56
-Suggests: netdata-plugin-cups,
57
- netdata-plugin-freeipmi
58
-Recommends: netdata-plugin-systemd-journal
56
+Suggests: netdata-plugin-cups (= ${source:Version}),
57
+ netdata-plugin-freeipmi (= ${source:Version})
58
+Recommends: netdata-plugin-systemd-journal (= ${source:Version})
59
Description: real-time charts for system monitoring
60
Netdata is a daemon that collects data in realtime (per second)
61
and presents a web site to view and analyze them. The presentation
netdata.spec.in
+14
-13
@@ -136,24 +136,24 @@ Requires(pre): /usr/sbin/useradd
136
# makes it impossible to properly test the packages prior to upload,
137
# so we just skip depending on them on CentOS 7.
138
%if 0%{?_have_ebpf}
139
-Requires: netdata-plugin-ebpf
140
-%endif
141
-Requires: netdata-plugin-apps
142
-Requires: netdata-plugin-pythond
143
-Requires: netdata-plugin-go
144
-Requires: netdata-plugin-debugfs
145
-Requires: netdata-plugin-chartsd
146
-Requires: netdata-plugin-slabinfo
147
-Requires: netdata-plugin-perf
139
+Requires: netdata-plugin-ebpf = %{version}
140
+%endif
141
+Requires: netdata-plugin-apps = %{version}
142
+Requires: netdata-plugin-pythond = %{version}
143
+Requires: netdata-plugin-go = %{version}
144
+Requires: netdata-plugin-debugfs = %{version}
145
+Requires: netdata-plugin-chartsd = %{version}
146
+Requires: netdata-plugin-slabinfo = %{version}
147
+Requires: netdata-plugin-perf = %{version}
148
%if 0%{?_have_nfacct}
149
-Requires: netdata-plugin-nfacct
149
+Requires: netdata-plugin-nfacct = %{version}
150
%endif
151
%if 0%{?_have_freeipmi} && 0%{?centos_ver} != 6 && 0%{?centos_ver} != 7 && 0%{?amazon_linux} != 2
152
-Suggests: netdata-plugin-freeipmi
152
+Suggests: netdata-plugin-freeipmi = %{version}
153
%endif
154
%if 0%{?centos_ver} != 6 && 0%{?centos_ver} != 7 && 0%{?amazon_linux} != 2
155
-Suggests: netdata-plugin-cups
156
-Recommends: netdata-plugin-systemd-journal
155
+Suggests: netdata-plugin-cups = %{version}
156
+Recommends: netdata-plugin-systemd-journal = %{version}
157
%endif
158
159
@@ -919,6 +919,7 @@ fi
919
%caps(cap_dac_read_search=ep) %attr(0750,root,netdata) %{_libexecdir}/%{name}/plugins.d/systemd-journal.plugin
920
921
%changelog
922
+* Mon Aug 21 2023 Austin Hemmelgarn <austin@netdata.cloud> 0.0.0-22
923
* Thu Aug 03 2023 Austin Hemmelgarn <austin@netdata.cloud> 0.0.0-21
924
- Added systemd-journal plugin handling
925
* Wed Jun 14 2023 Konstantin Shalygin <k0ste@k0ste.ru> 0.0.0-20