diff options
author | Costa Tsaousis <costa@tsaousis.gr> | 2020-11-18 18:48:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-18 11:48:42 -0500 |
commit | 40da71e1eb0b65e24745df332d8e28a716830b00 (patch) | |
tree | 18e15644a806e8be3a6a150d3d08ac777b39b24c | |
parent | 5e82d4dd2db8d6a585662d09279f31a4a93424bc (diff) |
Updated 3rd party static build dependencies and use alpine 3.12 (#10241)
* updated 3rd party static dependencies
* updated alpine to 3.12
* updated docker container name and added libuv-static
* add lz4-static to alpine packages
-rwxr-xr-x | packaging/makeself/build-x86_64-static.sh | 4 | ||||
-rwxr-xr-x | packaging/makeself/install-alpine-packages.sh | 3 | ||||
-rwxr-xr-x | packaging/makeself/jobs/50-bash-5.0.install.sh (renamed from packaging/makeself/jobs/50-bash-4.4.18.install.sh) | 2 | ||||
-rwxr-xr-x | packaging/makeself/jobs/50-curl-7.73.0.install.sh (renamed from packaging/makeself/jobs/50-curl-7.60.0.install.sh) | 4 | ||||
-rwxr-xr-x | packaging/makeself/jobs/50-fping-5.0.install.sh (renamed from packaging/makeself/jobs/50-fping-4.2.install.sh) | 2 | ||||
-rwxr-xr-x | packaging/makeself/jobs/50-ioping-1.2.install.sh (renamed from packaging/makeself/jobs/50-ioping-1.1.install.sh) | 2 | ||||
-rw-r--r-- | packaging/makeself/openssl.version | 2 |
7 files changed, 11 insertions, 8 deletions
diff --git a/packaging/makeself/build-x86_64-static.sh b/packaging/makeself/build-x86_64-static.sh index dca6f1ae08..83fa0dba92 100755 --- a/packaging/makeself/build-x86_64-static.sh +++ b/packaging/makeself/build-x86_64-static.sh @@ -7,7 +7,7 @@ set -e -DOCKER_CONTAINER_NAME="netdata-package-x86_64-static-alpine37" +DOCKER_CONTAINER_NAME="netdata-package-x86_64-static-alpine312" if ! docker inspect "${DOCKER_CONTAINER_NAME}" > /dev/null 2>&1; then # To run interactively: @@ -23,7 +23,7 @@ if ! docker inspect "${DOCKER_CONTAINER_NAME}" > /dev/null 2>&1; then # inside the container and runs the script install-alpine-packages.sh # (also inside the container) # - run docker run -v "$(pwd)":/usr/src/netdata.git:rw alpine:3.7 \ + run docker run -v "$(pwd)":/usr/src/netdata.git:rw alpine:3.12 \ /bin/sh /usr/src/netdata.git/packaging/makeself/install-alpine-packages.sh # save the changes made permanently diff --git a/packaging/makeself/install-alpine-packages.sh b/packaging/makeself/install-alpine-packages.sh index 4756102afb..b4e516be25 100755 --- a/packaging/makeself/install-alpine-packages.sh +++ b/packaging/makeself/install-alpine-packages.sh @@ -26,10 +26,13 @@ apk add --no-cache -U \ util-linux-dev \ gnutls-dev \ zlib-dev \ + zlib-static \ libmnl-dev \ libnetfilter_acct-dev \ libuv-dev \ + libuv-static \ lz4-dev \ + lz4-static \ snappy-dev \ protobuf-dev \ binutils \ diff --git a/packaging/makeself/jobs/50-bash-4.4.18.install.sh b/packaging/makeself/jobs/50-bash-5.0.install.sh index b9b139680e..a204c1575b 100755 --- a/packaging/makeself/jobs/50-bash-4.4.18.install.sh +++ b/packaging/makeself/jobs/50-bash-5.0.install.sh @@ -4,7 +4,7 @@ # shellcheck source=packaging/makeself/functions.sh . "$(dirname "${0}")/../functions.sh" "${@}" || exit 1 -fetch "bash-4.4.18" "http://ftp.gnu.org/gnu/bash/bash-4.4.18.tar.gz" +fetch "bash-5.0" "http://ftp.gnu.org/gnu/bash/bash-5.0.tar.gz" export PKG_CONFIG_PATH="/openssl-static/lib/pkgconfig" diff --git a/packaging/makeself/jobs/50-curl-7.60.0.install.sh b/packaging/makeself/jobs/50-curl-7.73.0.install.sh index 55d6a979f8..6b7939060b 100755 --- a/packaging/makeself/jobs/50-curl-7.60.0.install.sh +++ b/packaging/makeself/jobs/50-curl-7.73.0.install.sh @@ -4,14 +4,14 @@ # shellcheck source=packaging/makeself/functions.sh . "$(dirname "${0}")/../functions.sh" "${@}" || exit 1 -fetch "curl-curl-7_60_0" "https://github.com/curl/curl/archive/curl-7_60_0.tar.gz" +fetch "curl-7.73.0" "https://curl.haxx.se/download/curl-7.73.0.tar.gz" export CFLAGS="-I/openssl-static/include" export LDFLAGS="-static -L/openssl-static/lib" export PKG_CONFIG="pkg-config --static" export PKG_CONFIG_PATH="/openssl-static/lib/pkgconfig" -run ./buildconf +run autoreconf -fi run ./configure \ --prefix="${NETDATA_INSTALL_PATH}" \ diff --git a/packaging/makeself/jobs/50-fping-4.2.install.sh b/packaging/makeself/jobs/50-fping-5.0.install.sh index 04766bc4a8..e62c47e451 100755 --- a/packaging/makeself/jobs/50-fping-4.2.install.sh +++ b/packaging/makeself/jobs/50-fping-5.0.install.sh @@ -4,7 +4,7 @@ # shellcheck source=packaging/makeself/functions.sh . "$(dirname "${0}")/../functions.sh" "${@}" || exit 1 -fetch "fping-4.2" "https://github.com/schweikert/fping/releases/download/v4.2/fping-4.2.tar.gz" +fetch "fping-5.0" "https://fping.org/dist/fping-5.0.tar.gz" export CFLAGS="-static -I/openssl-static/include" export LDFLAGS="-static -L/openssl-static/lib" diff --git a/packaging/makeself/jobs/50-ioping-1.1.install.sh b/packaging/makeself/jobs/50-ioping-1.2.install.sh index a3f57f5f8c..22f26914a6 100755 --- a/packaging/makeself/jobs/50-ioping-1.1.install.sh +++ b/packaging/makeself/jobs/50-ioping-1.2.install.sh @@ -4,7 +4,7 @@ # shellcheck source=packaging/makeself/functions.sh . "$(dirname "${0}")/../functions.sh" "${@}" || exit 1 -fetch "netdata-ioping-43d15a5" "https://github.com/netdata/ioping/tarball/master" +fetch "ioping-1.2" "https://github.com/koct9i/ioping/archive/v1.2.tar.gz" export CFLAGS="-static" diff --git a/packaging/makeself/openssl.version b/packaging/makeself/openssl.version index e2137bd498..adc000b355 100644 --- a/packaging/makeself/openssl.version +++ b/packaging/makeself/openssl.version @@ -1 +1 @@ -OpenSSL_1_1_1g +OpenSSL_1_1_1h |