From fd06a01f7a74916795384f72d9535ec81039e68a Mon Sep 17 00:00:00 2001
From: "Austin S. Hemmelgarn" <austin@netdata.cloud>
Date: Mon, 8 Jul 2024 08:23:01 -0400
Subject: [PATCH] Relax strict version constraints for DEB package
dependencies. (#17681)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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.
---
packaging/cmake/Modules/Packaging.cmake | 26 ++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/packaging/cmake/Modules/Packaging.cmake b/packaging/cmake/Modules/Packaging.cmake
index 1dd2328cdf..3bb70ecf58 100644
--- a/packaging/cmake/Modules/Packaging.cmake
+++ b/packaging/cmake/Modules/Packaging.cmake
@@ -56,43 +56,43 @@ set(CPACK_DEBIAN_NETDATA_PACKAGE_NAME "netdata")
set(CPACK_DEBIAN_NETDATA_PACKAGE_SECTION "net")
set(CPACK_DEBIAN_NETDATA_PACKAGE_PREDEPENDS "adduser, libcap2-bin")
set(CPACK_DEBIAN_NETDATA_PACKAGE_SUGGESTS
- "netdata-plugin-cups (= ${CPACK_PACKAGE_VERSION}), netdata-plugin-freeipmi (= ${CPACK_PACKAGE_VERSION})")
+ "netdata-plugin-cups, netdata-plugin-freeipmi")
set(CPACK_DEBIAN_NETDATA_PACKAGE_RECOMMENDS
- "netdata-plugin-systemd-journal (= ${CPACK_PACKAGE_VERSION}), \
-netdata-plugin-logs-management (= ${CPACK_PACKAGE_VERSION}), \
-netdata-plugin-network-viewer (= ${CPACK_PACKAGE_VERSION})")
+ "netdata-plugin-systemd-journal, \
+netdata-plugin-logs-management, \
+netdata-plugin-network-viewer")
set(CPACK_DEBIAN_NETDATA_PACKAGE_CONFLICTS
"netdata-core, netdata-plugins-bash, netdata-plugins-python, netdata-web")
-list(APPEND _main_deps "netdata-plugin-chartsd (= ${CPACK_PACKAGE_VERSION})")
-list(APPEND _main_deps "netdata-plugin-pythond (= ${CPACK_PACKAGE_VERSION})")
+list(APPEND _main_deps "netdata-plugin-chartsd")
+list(APPEND _main_deps "netdata-plugin-pythond")
if(ENABLE_PLUGIN_APPS)
- list(APPEND _main_deps "netdata-plugin-apps (= ${CPACK_PACKAGE_VERSION})")
+ list(APPEND _main_deps "netdata-plugin-apps")
endif()
if(ENABLE_PLUGIN_GO)
- list(APPEND _main_deps "netdata-plugin-go (= ${CPACK_PACKAGE_VERSION})")
+ list(APPEND _main_deps "netdata-plugin-go")
endif()
if(ENABLE_PLUGIN_DEBUGFS)
- list(APPEND _main_deps "netdata-plugin-debugfs (= ${CPACK_PACKAGE_VERSION})")
+ list(APPEND _main_deps "netdata-plugin-debugfs")
endif()
if(ENABLE_PLUGIN_NFACCT)
- list(APPEND _main_deps "netdata-plugin-nfacct (= ${CPACK_PACKAGE_VERSION})")
+ list(APPEND _main_deps "netdata-plugin-nfacct")
endif()
if(ENABLE_PLUGIN_SLABINFO)
- list(APPEND _main_deps "netdata-plugin-slabinfo (= ${CPACK_PACKAGE_VERSION})")
+ list(APPEND _main_deps "netdata-plugin-slabinfo")
endif()
if(ENABLE_PLUGIN_PERF)
- list(APPEND _main_deps "netdata-plugin-perf (= ${CPACK_PACKAGE_VERSION})")
+ list(APPEND _main_deps "netdata-plugin-perf")
endif()
if(ENABLE_PLUGIN_EBPF)
- list(APPEND _main_deps "netdata-plugin-ebpf (= ${CPACK_PACKAGE_VERSION})")
+ list(APPEND _main_deps "netdata-plugin-ebpf")
endif()
list(JOIN _main_deps ", " CPACK_DEBIAN_NETDATA_PACKAGE_DEPENDS)