summaryrefslogtreecommitdiffstats
path: root/packaging/installer/install-required-packages.sh
diff options
context:
space:
mode:
authorAustin S. Hemmelgarn <austin@netdata.cloud>2020-02-25 21:51:39 -0500
committerGitHub <noreply@github.com>2020-02-25 21:51:39 -0500
commitb500359f0c6c8dfcc2dbbbdc48ca18f38df41ba5 (patch)
tree6425831cc74eeae7bffdd60eb0b66408bf1b810f /packaging/installer/install-required-packages.sh
parentccb2119f847efdb8f17cfcc48137b9a4a88083d5 (diff)
Added libwebsockets bundling code to netdata-installer.sh (#8144)
* Generalize handling of fetch and verification of archives. This generalizes the logic used for fetching and verifying source archives for external dependencies that we potentially bundle as part of our regular build. It also slightly improves the error handling for the bundling of libmosquitto. * Add code to bundle libwebsockets during install. This gets used when building on a system without libwebsockets3. Due to how the libwebsockets build system works, this adds cmake as an installer dependency on systems that do not have libwebsockets3. * Add libwebsockets-dev to install-required-packages.sh * Fix error caused by resolving merge conflict incorrectly. * Unconditionally bunlde libwebsockets if cloud is enabled on install. As discussed with the product team, we're taking this approach to ensure SOCKS5 proxy support.
Diffstat (limited to 'packaging/installer/install-required-packages.sh')
-rwxr-xr-xpackaging/installer/install-required-packages.sh14
1 files changed, 14 insertions, 0 deletions
diff --git a/packaging/installer/install-required-packages.sh b/packaging/installer/install-required-packages.sh
index b562f9ebed..6876bd2f57 100755
--- a/packaging/installer/install-required-packages.sh
+++ b/packaging/installer/install-required-packages.sh
@@ -591,6 +591,12 @@ declare -A pkg_automake=(
['default']="automake"
)
+# Required to build libwebsockets and libmosquitto on some systems.
+declare -A pkg_cmake=(
+ ['clearlinux']="c-basic"
+ ['default']="cmake"
+)
+
declare -A pkg_bridge_utils=(
['gentoo']="net-misc/bridge-utils"
['clearlinux']="network-basic"
@@ -703,6 +709,12 @@ declare -A pkg_libmnl_dev=(
['default']=""
)
+declare -A pkg_libwebsockets_dev=(
+ ['debian']="libwebsockets-dev"
+ ['ubuntu']="libwebsockets-dev"
+ ['default']="libwebsockets-devel"
+)
+
declare -A pkg_lm_sensors=(
['alpine']="lm_sensors"
['arch']="lm_sensors"
@@ -1104,6 +1116,7 @@ packages() {
require_cmd autogen || suitable_package autogen
require_cmd automake || suitable_package automake
require_cmd pkg-config || suitable_package pkg-config
+ require_cmd cmake || suitable_package cmake
# -------------------------------------------------------------------------
# debugging tools for development
@@ -1157,6 +1170,7 @@ packages() {
suitable_package libz-dev
suitable_package libuuid-dev
suitable_package libmnl-dev
+ suitable_package libwebsockets-dev
fi
# -------------------------------------------------------------------------