summaryrefslogtreecommitdiffstats
path: root/packaging/makeself/jobs
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2022-04-14 18:12:14 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2022-04-14 18:12:14 +0000
commitbb50acdcb8073654ea667b8c0272e335bd43f844 (patch)
tree1e00c8a29871426f8182658928dcb62e42d57ce8 /packaging/makeself/jobs
parentReleasing debian version 1.33.1-1. (diff)
downloadnetdata-bb50acdcb8073654ea667b8c0272e335bd43f844.tar.xz
netdata-bb50acdcb8073654ea667b8c0272e335bd43f844.zip
Merging upstream version 1.34.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'packaging/makeself/jobs')
-rwxr-xr-xpackaging/makeself/jobs/50-bash-5.1.16.install.sh (renamed from packaging/makeself/jobs/50-bash-5.1.8.install.sh)4
-rwxr-xr-xpackaging/makeself/jobs/50-curl-7.82.0.install.sh (renamed from packaging/makeself/jobs/50-curl-7.78.0.install.sh)4
-rwxr-xr-xpackaging/makeself/jobs/50-fping-5.1.install.sh (renamed from packaging/makeself/jobs/50-fping-5.0.install.sh)4
-rwxr-xr-xpackaging/makeself/jobs/99-makeself.install.sh5
4 files changed, 7 insertions, 10 deletions
diff --git a/packaging/makeself/jobs/50-bash-5.1.8.install.sh b/packaging/makeself/jobs/50-bash-5.1.16.install.sh
index 22c9286af..d5cdfff1c 100755
--- a/packaging/makeself/jobs/50-bash-5.1.8.install.sh
+++ b/packaging/makeself/jobs/50-bash-5.1.16.install.sh
@@ -7,8 +7,8 @@
# shellcheck disable=SC2015
[ "${GITHUB_ACTIONS}" = "true" ] && echo "::group::building bash" || true
-fetch "bash-5.1.8" "http://ftp.gnu.org/gnu/bash/bash-5.1.8.tar.gz" \
- 0cfb5c9bb1a29f800a97bd242d19511c997a1013815b805e0fdd32214113d6be
+fetch "bash-5.1.16" "http://ftp.gnu.org/gnu/bash/bash-5.1.16.tar.gz" \
+ 5bac17218d3911834520dad13cd1f85ab944e1c09ae1aba55906be1f8192f558
export PKG_CONFIG_PATH="/openssl-static/lib/pkgconfig"
diff --git a/packaging/makeself/jobs/50-curl-7.78.0.install.sh b/packaging/makeself/jobs/50-curl-7.82.0.install.sh
index aeab1af68..f8fa4042c 100755
--- a/packaging/makeself/jobs/50-curl-7.78.0.install.sh
+++ b/packaging/makeself/jobs/50-curl-7.82.0.install.sh
@@ -7,8 +7,8 @@
# shellcheck disable=SC2015
[ "${GITHUB_ACTIONS}" = "true" ] && echo "::group::Building cURL" || true
-fetch "curl-7.78.0" "https://curl.haxx.se/download/curl-7.78.0.tar.gz" \
- ed936c0b02c06d42cf84b39dd12bb14b62d77c7c4e875ade022280df5dcc81d7
+fetch "curl-7.82.0" "https://curl.haxx.se/download/curl-7.82.0.tar.gz" \
+ 910cc5fe279dc36e2cca534172c94364cf3fcf7d6494ba56e6c61a390881ddce
export CFLAGS="-I/openssl-static/include"
export LDFLAGS="-static -L/openssl-static/lib"
diff --git a/packaging/makeself/jobs/50-fping-5.0.install.sh b/packaging/makeself/jobs/50-fping-5.1.install.sh
index 8bef27d4d..e1435e944 100755
--- a/packaging/makeself/jobs/50-fping-5.0.install.sh
+++ b/packaging/makeself/jobs/50-fping-5.1.install.sh
@@ -7,8 +7,8 @@
# shellcheck disable=SC2015
[ "${GITHUB_ACTIONS}" = "true" ] && echo "::group::Building fping" || true
-fetch "fping-5.0" "https://fping.org/dist/fping-5.0.tar.gz" \
- ed38c0b9b64686a05d1b3bc1d66066114a492e04e44eef1821d43b1263cd57b8
+fetch "fping-5.1" "https://fping.org/dist/fping-5.1.tar.gz" \
+ 1ee5268c063d76646af2b4426052e7d81a42b657e6a77d8e7d3d2e60fd7409fe
export CFLAGS="-static -I/openssl-static/include"
export LDFLAGS="-static -L/openssl-static/lib"
diff --git a/packaging/makeself/jobs/99-makeself.install.sh b/packaging/makeself/jobs/99-makeself.install.sh
index 9dfcfbed7..d29d0580a 100755
--- a/packaging/makeself/jobs/99-makeself.install.sh
+++ b/packaging/makeself/jobs/99-makeself.install.sh
@@ -12,10 +12,7 @@ run cd "${NETDATA_SOURCE_PATH}" || exit 1
# -----------------------------------------------------------------------------
# find the netdata version
-VERSION="$(git describe 2> /dev/null)"
-if [ -z "${VERSION}" ]; then
- VERSION=$(cat packaging/version)
-fi
+VERSION="$("${NETDATA_INSTALL_PARENT}/netdata/bin/netdata" -v | cut -f 2 -d ' ')"
if [ "${VERSION}" == "" ]; then
echo >&2 "Cannot find version number. Create makeself executable from source code with git tree structure."