diff options
| author | Costa Tsaousis (ktsaou) <costa@tsaousis.gr> | 2018-05-26 19:55:54 +0300 |
|---|---|---|
| committer | Costa Tsaousis (ktsaou) <costa@tsaousis.gr> | 2018-05-26 19:55:54 +0300 |
| commit | 2a608cea6ae5ee25976a1394dec8e322f1a6d995 (patch) | |
| tree | 2c7dedc238346d81a14c2ecedb300f3dd7ba91b0 /makeself | |
| parent | 1885227232af007be381f0a0f828c78160b4b29d (diff) | |
do not attempt to use bash loadable modules on static builds; update bash to 4.4.18 and curl to 7.60.0
Diffstat (limited to 'makeself')
| -rw-r--r-- | makeself/Makefile.am | 4 | ||||
| -rwxr-xr-x | makeself/jobs/50-bash-4.4.18.install.sh (renamed from makeself/jobs/50-bash-4.4.install.sh) | 7 | ||||
| -rwxr-xr-x | makeself/jobs/50-curl-7.60.0.install.sh (renamed from makeself/jobs/50-curl-7.53.1.install.sh) | 2 | ||||
| -rwxr-xr-x | makeself/jobs/99-makeself.install.sh | 1 |
4 files changed, 9 insertions, 5 deletions
diff --git a/makeself/Makefile.am b/makeself/Makefile.am index 923f3cefba..1c3bc7bcea 100644 --- a/makeself/Makefile.am +++ b/makeself/Makefile.am @@ -10,8 +10,8 @@ dist_noinst_SCRIPTS = \ install-alpine-packages.sh \ post-installer.sh \ jobs/10-prepare-destination.install.sh \ - jobs/50-curl-7.53.1.install.sh \ - jobs/50-bash-4.4.install.sh \ + jobs/50-curl-7.60.0.install.sh \ + jobs/50-bash-4.4.18.install.sh \ jobs/50-fping-4.0.install.sh \ jobs/70-netdata-git.install.sh \ jobs/99-makeself.install.sh \ diff --git a/makeself/jobs/50-bash-4.4.install.sh b/makeself/jobs/50-bash-4.4.18.install.sh index 7868a1e76f..9a8d253019 100755 --- a/makeself/jobs/50-bash-4.4.install.sh +++ b/makeself/jobs/50-bash-4.4.18.install.sh @@ -2,13 +2,16 @@ . $(dirname "${0}")/../functions.sh "${@}" || exit 1 -fetch "bash-4.4" "http://ftp.gnu.org/gnu/bash/bash-4.4.tar.gz" +fetch "bash-4.4.18" "http://ftp.gnu.org/gnu/bash/bash-4.4.18.tar.gz" run ./configure \ --prefix=${NETDATA_INSTALL_PATH} \ + --without-bash-malloc \ --enable-static-link \ + --enable-net-redirections \ + --enable-array-variables \ + --disable-profiling \ --disable-nls \ - --without-bash-malloc \ # --disable-rpath \ # --enable-alias \ # --enable-arith-for-command \ diff --git a/makeself/jobs/50-curl-7.53.1.install.sh b/makeself/jobs/50-curl-7.60.0.install.sh index ea80f0d2cf..ad5465065e 100755 --- a/makeself/jobs/50-curl-7.53.1.install.sh +++ b/makeself/jobs/50-curl-7.60.0.install.sh @@ -2,7 +2,7 @@ . $(dirname "${0}")/../functions.sh "${@}" || exit 1 -fetch "curl-curl-7_53_1" "https://github.com/curl/curl/archive/curl-7_53_1.tar.gz" +fetch "curl-curl-7_60_0" "https://github.com/curl/curl/archive/curl-7_60_0.tar.gz" export LDFLAGS="-static" export PKG_CONFIG="pkg-config --static" diff --git a/makeself/jobs/99-makeself.install.sh b/makeself/jobs/99-makeself.install.sh index 698f2f92d8..ec79487698 100755 --- a/makeself/jobs/99-makeself.install.sh +++ b/makeself/jobs/99-makeself.install.sh @@ -64,6 +64,7 @@ run mv "${NETDATA_INSTALL_PATH}/bin/netdata" \ cat >"${NETDATA_INSTALL_PATH}/bin/netdata" <<EOF #!${NETDATA_INSTALL_PATH}/bin/bash +export BASH_LOADABLES_PATH="${NETDATA_INSTALL_PATH}/lib/bash" export PATH="${NETDATA_INSTALL_PATH}/bin:\${PATH}" exec "${NETDATA_INSTALL_PATH}/bin/srv/netdata" "\${@}" EOF |