summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorAustin S. Hemmelgarn <austin@netdata.cloud>2024-05-22 11:15:04 -0400
committerGitHub <noreply@github.com>2024-05-22 11:15:04 -0400
commite704b912dacb3a954f5d026475834c218513468c (patch)
tree26b25fd90fcaa4a7ee2c6d73fd031eb7804ccabd /packaging
parent0c8277f8d935809a00db4ac2726706956c61716b (diff)
Clean up DEB package dependencies. (#17680)
* Clean up DEB package dependencies. - dpkg is an implicit dependency for all DEB packages by virtue of them being DEB packages, and we do not support any platforms that have an old enough version to be an issue, so we don’t need a versioned dependency on it either, so simply drop the explicit dependency on dpkg. - We also don’t support any platforms that ship an old enough version of libcap2-bin to cause us problems, so remove the version constraint on that as well. - The lsb-base predepend is only needed if the user is using a non-systemd init system. We don’t fully support this setup with our native packages, and it’s a non-default configuration for Debian and completely unsupported on Ubuntu, so it’s safe to assume that the user knows what they are doing if they need it and not explicitly require this. - The apps plugin was missed in #17584, so fix it’s conflicts line here. - The chartsd plugin _requires_ bash to function correctly, so actually depend on it instead of recommending it (this will be a no-op on a vast majority of systems, but is still useful insurance against users doing stupid things). - The CUPS and FreeIPMI plugins both pull in all the things they actually need via automatic dependency generation, so there is no reason for us to pull in full installs of CUPS or FreeIPMI as dependencies. - Everything in the Go plugin that was using `sudo` has been converted to use `ndsudo` instead, so we don’t need to ask for `sudo` at all for it anymore. - The Python plguin _requires_ Python to function correctly, so actually depend on it instead of recommending it. * Fix typo.
Diffstat (limited to 'packaging')
-rw-r--r--packaging/cmake/Modules/Packaging.cmake13
1 files changed, 5 insertions, 8 deletions
diff --git a/packaging/cmake/Modules/Packaging.cmake b/packaging/cmake/Modules/Packaging.cmake
index 7f9433867f..d5e6d9c949 100644
--- a/packaging/cmake/Modules/Packaging.cmake
+++ b/packaging/cmake/Modules/Packaging.cmake
@@ -48,8 +48,7 @@ set(CPACK_COMPONENT_NETDATA_DESCRIPTION
set(CPACK_DEBIAN_NETDATA_PACKAGE_NAME "netdata")
set(CPACK_DEBIAN_NETDATA_PACKAGE_SECTION "net")
-set(CPACK_DEBIAN_NETDATA_PACKAGE_PREDEPENDS
- "adduser, dpkg (>= 1.17.14), libcap2-bin (>=1:2.0), lsb-base (>= 3.1-23.2)")
+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})")
set(CPACK_DEBIAN_NETDATA_PACKAGE_RECOMMENDS
@@ -112,7 +111,7 @@ set(CPACK_COMPONENT_PLUGIN-APPS_DESCRIPTION
set(CPACK_DEBIAN_PLUGIN-APPS_PACKAGE_NAME "netdata-plugin-apps")
set(CPACK_DEBIAN_PLUGIN-APPS_PACKAGE_SECTION "net")
-set(CPACK_DEBIAN_PLUGIN-APPS_PACKAGE_CONFLICTS "netdata (<< ${CPACK_PACKAGE_VERSION})")
+set(CPACK_DEBIAN_PLUGIN-APPS_PACKAGE_CONFLICTS "netdata (<< 1.40)")
set(CPACK_DEBIAN_PLUGIN-APPS_PACKAGE_PREDEPENDS "libcap2-bin, adduser")
set(CPACK_DEBIAN_PLUGIN-APPS_PACKAGE_CONTROL_EXTRA
@@ -136,7 +135,7 @@ set(CPACK_DEBIAN_PLUGIN-CHARTSD_PACKAGE_NAME "netdata-plugin-chartsd")
set(CPACK_DEBIAN_PLUGIN-CHARTSD_PACKAGE_SECTION "net")
set(CPACK_DEBIAN_PLUGIN-CHARTSD_PACKAGE_CONFLICTS "netdata (<< 1.40)")
set(CPACK_DEBIAN_PLUGIN-CHARTSD_PACKAGE_PREDEPENDS "adduser")
-set(CPACK_DEBIAN_PLUGIN-CHARTSD_PACKAGE_RECOMMENDS "bash")
+set(CPACK_DEBIAN_PLUGIN-CHARTSD_PACKAGE_DEPENDS "bash")
set(CPACK_DEBIAN_PLUGIN-CHARTSD_PACKAGE_ARCHITECTURE "all")
set(CPACK_DEBIAN_PLUGIN-CHARTSD_PACKAGE_SUGGESTS "apcupsd, iw, sudo")
@@ -157,7 +156,6 @@ set(CPACK_COMPONENT_PLUGIN-CUPS_DESCRIPTION
set(CPACK_DEBIAN_PLUGIN-CUPS_PACKAGE_NAME "netdata-plugin-cups")
set(CPACK_DEBIAN_PLUGIN-CUPS_PACKAGE_SECTION "net")
-set(CPACK_DEBIAN_PLUGIN-CUPS_PACKAGE_DEPENDS "cups")
set(CPACK_DEBIAN_PLUGIN-CUPS_PACKAGE_PREDEPENDS "adduser")
set(CPACK_DEBIAN_PLUGIN-CUPS_PACKAGE_CONTROL_EXTRA
"${CMAKE_SOURCE_DIR}/packaging/cmake/control/cups/preinst;"
@@ -243,7 +241,6 @@ set(CPACK_COMPONENT_PLUGIN-FREEIPMI_DESCRIPTION
set(CPACK_DEBIAN_PLUGIN-FREEIPMI_PACKAGE_NAME "netdata-plugin-freeipmi")
set(CPACK_DEBIAN_PLUGIN-FREEIPMI_PACKAGE_SECTION "net")
-set(CPACK_DEBIAN_PLUGIN-FREEIPMI_PACKAGE_DEPENDS "freeipmi")
set(CPACK_DEBIAN_PLUGIN-FREEIPMI_PACKAGE_PREDEPENDS "adduser")
set(CPACK_DEBIAN_PLUGIN-FREEIPMI_PACKAGE_CONTROL_EXTRA
@@ -268,7 +265,7 @@ set(CPACK_DEBIAN_PLUGIN-GO_PACKAGE_NAME "netdata-plugin-go")
set(CPACK_DEBIAN_PLUGIN-GO_PACKAGE_SECTION "net")
set(CPACK_DEBIAN_PLUGIN-GO_PACKAGE_CONFLICTS "netdata (<< 1.40)")
set(CPACK_DEBIAN_PLUGIN-GO_PACKAGE_PREDEPENDS "libcap2-bin, adduser")
-set(CPACK_DEBIAN_PLUGIN-GO_PACKAGE_SUGGESTS "nvme-cli, sudo")
+set(CPACK_DEBIAN_PLUGIN-GO_PACKAGE_SUGGESTS "nvme-cli")
set(CPACK_DEBIAN_PLUGIN-GO_PACKAGE_CONTROL_EXTRA
"${CMAKE_SOURCE_DIR}/packaging/cmake/control/go.d/preinst;"
@@ -376,7 +373,7 @@ set(CPACK_DEBIAN_PLUGIN-PYTHOND_PACKAGE_SECTION "net")
set(CPACK_DEBIAN_PLUGIN-PYTHOND_PACKAGE_CONFLICTS "netdata (<< 1.40)")
set(CPACK_DEBIAN_PLUGIN-PYTHOND_PACKAGE_PREDEPENDS "adduser")
set(CPACK_DEBIAN_PLUGIN-PYTHOND_PACKAGE_SUGGESTS "sudo")
-set(CPACK_DEBIAN_PLUGIN-PYTHOND_PACHAGE_RECOMMENDS "python3")
+set(CPACK_DEBIAN_PLUGIN-PYTHOND_PACHAGE_DEPENDS "python3")
set(CPACK_DEBIAN_PLUGIN-PYTHOND_PACKAGE_ARCHITECTURE "all")
set(CPACK_DEBIAN_PLUGIN-PYTHOND_PACKAGE_CONTROL_EXTRA