Added code to bundle LWS in binary packages. (#8255)
* Added code to bundle LWS in binary packages. This adds the required tode to bundle a custom build of libwebsockets as required by Netdata Cloud functionality into the binary packages. * Update packaging/bundle-lws.sh Co-Authored-By: James Mills <prologic@shortcircuit.net.au> Co-authored-by: James Mills <prologic@shortcircuit.net.au>
Austin S. Hemmelgarn committed
Mar 9, 2020 at 07:38 UTC
83a50413a54cf0d0ddb2d42fb445b5607958a0db
9 files changed
+26
contrib/debian/control
+1
@@ -17,6 +17,7 @@ Build-Depends: debhelper (>= 9),
17
libsnappy-dev,
18
libprotobuf-dev,
19
libprotoc-dev,
20
+ cmake,
21
autogen,
22
autoconf,
23
automake,
contrib/debian/control.buster
+1
@@ -17,6 +17,7 @@ Build-Depends: debhelper (>= 9),
17
libsnappy-dev,
18
libprotobuf-dev,
19
libprotoc-dev,
20
+ cmake,
21
autogen,
22
autoconf,
23
automake,
contrib/debian/control.jessie
+1
@@ -16,6 +16,7 @@ Build-Depends: debhelper (>= 9),
16
libsnappy-dev,
17
libprotobuf-dev,
18
libprotoc-dev,
19
+ cmake,
20
autogen,
21
autoconf,
22
automake,
contrib/debian/control.trusty
+1
@@ -16,6 +16,7 @@ Build-Depends: debhelper (>= 9),
16
libsnappy-dev,
17
libprotobuf-dev,
18
libprotoc-dev,
19
+ cmake,
20
autogen,
21
autoconf,
22
automake,
contrib/debian/control.wheezy
+1
@@ -3,6 +3,7 @@ Build-Depends: debhelper (>= 9),
3
dh-autoreconf,
4
pkg-config,
5
dpkg-dev (>= 1.13.19),
6
+ cmake,
7
zlib1g-dev,
8
uuid-dev
9
Section: net
contrib/debian/control.xenial
+1
@@ -17,6 +17,7 @@ Build-Depends: debhelper (>= 9),
17
libsnappy-dev,
18
libprotobuf-dev,
19
libprotoc-dev,
20
+ cmake,
21
autogen,
22
autoconf,
23
automake,
contrib/debian/rules
+1
@@ -19,6 +19,7 @@ TEMPTOP = $(CURDIR)/debian/tmp
19
20
override_dh_auto_configure:
21
packaging/bundle-mosquitto.sh .
22
+ packaging/bundle-lws.sh .
23
autoreconf -ivf
24
dh_auto_configure -- --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib \
25
--libexecdir=/usr/libexec --with-user=netdata --with-math --with-zlib --with-webdir=/var/lib/netdata/www
netdata.spec.in
+2
@@ -109,6 +109,7 @@ BuildRequires: autoconf-archive
109
BuildRequires: autogen
110
%endif
111
BuildRequires: automake
112
+BuildRequires: cmake
113
BuildRequires: pkgconfig
114
BuildRequires: curl
115
BuildRequires: findutils
@@ -233,6 +234,7 @@ happened, on your systems and applications.
234
%prep
235
%setup -q -n %{name}-%{version}
236
${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-mosquitto.sh ${RPM_BUILD_DIR}/%{name}-%{version}
237
+${RPM_BUILD_DIR}/%{name}-%{version}/packaging/bundle-lws.sh ${RPM_BUILD_DIR}/%{name}-%{version}
238
239
%build
240
# Conf step
packaging/bundle-lws.sh
new
+17
@@ -0,0 +1,17 @@
1
+#!/bin/sh
2
+
3
+startdir="${PWD}"
4
+
5
+LWS_TARBALL="v$(cat "${1}/packaging/libwebsockets.version").tar.gz"
6
+LWS_BUILD_PATH="${1}/externaldeps/libwebsockets/libwebsockets-$(cat "${1}/packaging/libwebsockets.version")"
7
+
8
+mkdir -p "${1}/externaldeps/libwebsockets" || exit 1
9
+curl -sSL --connect-timeout 10 --retry 3 "https://github.com/warmcat/libwebsockets/archive/${LWS_TARBALL}" > "${LWS_TARBALL}" || exit 1
10
+sha256sum -c "${1}/packaging/libwebsockets.checksums" || exit 1
11
+tar -xzf "${LWS_TARBALL}" -C "${1}/externaldeps/libwebsockets" || exit 1
12
+cd "${LWS_BUILD_PATH}" || exit 1
13
+cmake -D LWS_WITH_SOCKS5:boolean=YES . || exit 1
14
+make || exit 1
15
+cd "${startdir}" || exit 1
16
+cp -a "${LWS_BUILD_PATH}/lib/libwebsockets.a" "${1}/externaldeps/libwebsockets" || exit 1
17
+cp -a "${LWS_BUILD_PATH}/include" "${1}/externaldeps/libwebsockets" || exit 1