From 1ea0d8d0897ec2d84ff447874e2ebd6170f54287 Mon Sep 17 00:00:00 2001 From: Andrew Moss <1043609+amoss@users.noreply.github.com> Date: Thu, 27 Feb 2020 19:23:18 +0100 Subject: Adding support for ACLK build-configuration (#8223) * Fixes for issues not caught at review in #8144. (#8211) * Properly scrub build environment for external dependencies. * Remove LWS from our system-level dependencies. We've decided to just always bundle it in the installer. * Add missing dependency for Docker build process. * Use static-build of LWS library created by installer (#8157) * link static lib of LWS * only use static LWS by installer * handle -lcap * fix problem on debian without lcap * fix lws check Co-authored-by: Austin S. Hemmelgarn Co-authored-by: Timo <6674623+underhood@users.noreply.github.com> --- packaging/installer/install-required-packages.sh | 7 ------- packaging/installer/methods/manual.md | 10 ++++------ 2 files changed, 4 insertions(+), 13 deletions(-) (limited to 'packaging') diff --git a/packaging/installer/install-required-packages.sh b/packaging/installer/install-required-packages.sh index 6876bd2f57..d10b8cc306 100755 --- a/packaging/installer/install-required-packages.sh +++ b/packaging/installer/install-required-packages.sh @@ -709,12 +709,6 @@ 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" @@ -1170,7 +1164,6 @@ packages() { suitable_package libz-dev suitable_package libuuid-dev suitable_package libmnl-dev - suitable_package libwebsockets-dev fi # ------------------------------------------------------------------------- diff --git a/packaging/installer/methods/manual.md b/packaging/installer/methods/manual.md index 802aeea99c..e9d49cd93a 100644 --- a/packaging/installer/methods/manual.md +++ b/packaging/installer/methods/manual.md @@ -61,16 +61,16 @@ This is how to do it by hand: ```sh # Debian / Ubuntu -apt-get install zlib1g-dev uuid-dev libuv1-dev liblz4-dev libjudy-dev libssl-dev libmnl-dev gcc make git autoconf autoconf-archive autogen automake pkg-config curl python cmake libwebsockets-dev +apt-get install zlib1g-dev uuid-dev libuv1-dev liblz4-dev libjudy-dev libssl-dev libmnl-dev gcc make git autoconf autoconf-archive autogen automake pkg-config curl python cmake # Fedora -dnf install zlib-devel libuuid-devel libuv-devel lz4-devel Judy-devel openssl-devel libmnl-devel gcc make git autoconf autoconf-archive autogen automake pkgconfig curl findutils python cmake libwebsockets-devel +dnf install zlib-devel libuuid-devel libuv-devel lz4-devel Judy-devel openssl-devel libmnl-devel gcc make git autoconf autoconf-archive autogen automake pkgconfig curl findutils python cmake # CentOS / Red Hat Enterprise Linux -yum install autoconf automake curl gcc git libmnl-devel libuuid-devel openssl-devel libuv-devel lz4-devel Judy-devel make nc pkgconfig python zlib-devel cmake libwebsockets-devel +yum install autoconf automake curl gcc git libmnl-devel libuuid-devel openssl-devel libuv-devel lz4-devel Judy-devel make nc pkgconfig python zlib-devel cmake # openSUSE -zypper install zlib-devel libuuid-devel libuv-devel liblz4-devel judy-devel libopenssl-devel libmnl-devel gcc make git autoconf autoconf-archive autogen automake pkgconfig curl findutils python cmake libwebsockets-devel +zypper install zlib-devel libuuid-devel libuv-devel liblz4-devel judy-devel libopenssl-devel libmnl-devel gcc make git autoconf autoconf-archive autogen automake pkgconfig curl findutils python cmake ``` Once Netdata is compiled, to run it the following packages are required (already installed using the above commands): @@ -119,8 +119,6 @@ Netdata Cloud support may require the following packages to be installed: | package | description |:--------:| ----------------------- -| `libwebsockets-devel` | Version 3 or higher is at needed build time for websockets support for Netdata Cloud -| `libwebsockets` | Version 3 or higher is needed at runtime for websockets support for Netdata Cloud | `cmake` | Needed at build time if you aren't using your distribution's version of libwebsockets or are building on a platform other than Linux *Netdata will greatly benefit if you have the above packages installed, but it will still work without them.* -- cgit v1.2.3