Relax strict version constraints for DEB package dependencies. (#17681)
Outside of a few cases involving eBPF, we don’t actually need to have an exact match between individual package component versions. Removing this constraint significantly simplifies our dependency graph, and should both speed up updates, and also make them much more reliable. This will also simplify consolidation of dependency handling across package types, because our package names are identical between DEB and RPM packages.
Austin S. Hemmelgarn committed
Jul 8, 2024 at 08:23 UTC
fd06a01f7a74916795384f72d9535ec81039e68a
1 file changed
+13
-13
packaging/cmake/Modules/Packaging.cmake
+13
-13
@@ -56,43 +56,43 @@ set(CPACK_DEBIAN_NETDATA_PACKAGE_NAME "netdata")
56
set(CPACK_DEBIAN_NETDATA_PACKAGE_SECTION "net")
57
set(CPACK_DEBIAN_NETDATA_PACKAGE_PREDEPENDS "adduser, libcap2-bin")
58
set(CPACK_DEBIAN_NETDATA_PACKAGE_SUGGESTS
59
- "netdata-plugin-cups (= ${CPACK_PACKAGE_VERSION}), netdata-plugin-freeipmi (= ${CPACK_PACKAGE_VERSION})")
59
+ "netdata-plugin-cups, netdata-plugin-freeipmi")
60
set(CPACK_DEBIAN_NETDATA_PACKAGE_RECOMMENDS
61
- "netdata-plugin-systemd-journal (= ${CPACK_PACKAGE_VERSION}), \
62
-netdata-plugin-logs-management (= ${CPACK_PACKAGE_VERSION}), \
63
-netdata-plugin-network-viewer (= ${CPACK_PACKAGE_VERSION})")
61
+ "netdata-plugin-systemd-journal, \
62
+netdata-plugin-logs-management, \
63
+netdata-plugin-network-viewer")
64
set(CPACK_DEBIAN_NETDATA_PACKAGE_CONFLICTS
65
"netdata-core, netdata-plugins-bash, netdata-plugins-python, netdata-web")
66
67
-list(APPEND _main_deps "netdata-plugin-chartsd (= ${CPACK_PACKAGE_VERSION})")
68
-list(APPEND _main_deps "netdata-plugin-pythond (= ${CPACK_PACKAGE_VERSION})")
67
+list(APPEND _main_deps "netdata-plugin-chartsd")
68
+list(APPEND _main_deps "netdata-plugin-pythond")
69
70
if(ENABLE_PLUGIN_APPS)
71
- list(APPEND _main_deps "netdata-plugin-apps (= ${CPACK_PACKAGE_VERSION})")
71
+ list(APPEND _main_deps "netdata-plugin-apps")
72
endif()
73
74
if(ENABLE_PLUGIN_GO)
75
- list(APPEND _main_deps "netdata-plugin-go (= ${CPACK_PACKAGE_VERSION})")
75
+ list(APPEND _main_deps "netdata-plugin-go")
76
endif()
77
78
if(ENABLE_PLUGIN_DEBUGFS)
79
- list(APPEND _main_deps "netdata-plugin-debugfs (= ${CPACK_PACKAGE_VERSION})")
79
+ list(APPEND _main_deps "netdata-plugin-debugfs")
80
endif()
81
82
if(ENABLE_PLUGIN_NFACCT)
83
- list(APPEND _main_deps "netdata-plugin-nfacct (= ${CPACK_PACKAGE_VERSION})")
83
+ list(APPEND _main_deps "netdata-plugin-nfacct")
84
endif()
85
86
if(ENABLE_PLUGIN_SLABINFO)
87
- list(APPEND _main_deps "netdata-plugin-slabinfo (= ${CPACK_PACKAGE_VERSION})")
87
+ list(APPEND _main_deps "netdata-plugin-slabinfo")
88
endif()
89
90
if(ENABLE_PLUGIN_PERF)
91
- list(APPEND _main_deps "netdata-plugin-perf (= ${CPACK_PACKAGE_VERSION})")
91
+ list(APPEND _main_deps "netdata-plugin-perf")
92
endif()
93
94
if(ENABLE_PLUGIN_EBPF)
95
- list(APPEND _main_deps "netdata-plugin-ebpf (= ${CPACK_PACKAGE_VERSION})")
95
+ list(APPEND _main_deps "netdata-plugin-ebpf")
96
endif()
97
98
list(JOIN _main_deps ", " CPACK_DEBIAN_NETDATA_PACKAGE_DEPENDS)