From 6d2e027eb728c8294fdd7c3692e9853b3ca2603b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 21 Feb 2019 20:34:08 +0100 Subject: Merging upstream version 1.12.1. Signed-off-by: Daniel Baumann --- .../jobs/10-prepare-destination.install.sh | 16 ---- packaging/makeself/jobs/50-bash-4.4.18.install.sh | 54 ------------ packaging/makeself/jobs/50-curl-7.60.0.install.sh | 34 -------- packaging/makeself/jobs/50-fping-4.0.install.sh | 29 ------- packaging/makeself/jobs/70-netdata-git.install.sh | 26 ------ packaging/makeself/jobs/99-makeself.install.sh | 99 ---------------------- 6 files changed, 258 deletions(-) delete mode 100755 packaging/makeself/jobs/10-prepare-destination.install.sh delete mode 100755 packaging/makeself/jobs/50-bash-4.4.18.install.sh delete mode 100755 packaging/makeself/jobs/50-curl-7.60.0.install.sh delete mode 100755 packaging/makeself/jobs/50-fping-4.0.install.sh delete mode 100755 packaging/makeself/jobs/70-netdata-git.install.sh delete mode 100755 packaging/makeself/jobs/99-makeself.install.sh (limited to 'packaging/makeself/jobs') diff --git a/packaging/makeself/jobs/10-prepare-destination.install.sh b/packaging/makeself/jobs/10-prepare-destination.install.sh deleted file mode 100755 index 06dc82f29..000000000 --- a/packaging/makeself/jobs/10-prepare-destination.install.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash -# SPDX-License-Identifier: GPL-3.0-or-later - -. $(dirname "${0}")/../functions.sh "${@}" || exit 1 - -[ -d "${NETDATA_INSTALL_PATH}.old" ] && run rm -rf "${NETDATA_INSTALL_PATH}.old" -[ -d "${NETDATA_INSTALL_PATH}" ] && run mv -f "${NETDATA_INSTALL_PATH}" "${NETDATA_INSTALL_PATH}.old" - -run mkdir -p "${NETDATA_INSTALL_PATH}/bin" -run mkdir -p "${NETDATA_INSTALL_PATH}/usr" -run cd "${NETDATA_INSTALL_PATH}" -run ln -s bin sbin -run cd "${NETDATA_INSTALL_PATH}/usr" -run ln -s ../bin bin -run ln -s ../sbin sbin -run ln -s . local diff --git a/packaging/makeself/jobs/50-bash-4.4.18.install.sh b/packaging/makeself/jobs/50-bash-4.4.18.install.sh deleted file mode 100755 index 3bdf3e751..000000000 --- a/packaging/makeself/jobs/50-bash-4.4.18.install.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env bash -# SPDX-License-Identifier: GPL-3.0-or-later - -. $(dirname "${0}")/../functions.sh "${@}" || exit 1 - -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 \ -# --disable-rpath \ -# --enable-alias \ -# --enable-arith-for-command \ -# --enable-array-variables \ -# --enable-brace-expansion \ -# --enable-casemod-attributes \ -# --enable-casemod-expansions \ -# --enable-command-timing \ -# --enable-cond-command \ -# --enable-cond-regexp \ -# --enable-directory-stack \ -# --enable-dparen-arithmetic \ -# --enable-function-import \ -# --enable-glob-asciiranges-default \ -# --enable-help-builtin \ -# --enable-job-control \ -# --enable-net-redirections \ -# --enable-process-substitution \ -# --enable-progcomp \ -# --enable-prompt-string-decoding \ -# --enable-readline \ -# --enable-select \ - - -run make clean -run make -j${SYSTEM_CPUS} - -cat >examples/loadables/Makefile <doc/Makefile <&2 "Cannot find version number. Create makeself executable from source code with git tree structure." - exit 1 -fi - -# ----------------------------------------------------------------------------- -# copy the files needed by makeself installation - -run mkdir -p "${NETDATA_INSTALL_PATH}/system" - -run cp \ - packaging/makeself/post-installer.sh \ - packaging/makeself/install-or-update.sh \ - packaging/installer/functions.sh \ - configs.signatures \ - system/netdata-init-d \ - system/netdata-lsb \ - system/netdata-openrc \ - system/netdata.logrotate \ - system/netdata.service \ - "${NETDATA_INSTALL_PATH}/system/" - - -# ----------------------------------------------------------------------------- -# create a wrapper to start our netdata with a modified path - -run mkdir -p "${NETDATA_INSTALL_PATH}/bin/srv" - -run mv "${NETDATA_INSTALL_PATH}/bin/netdata" \ - "${NETDATA_INSTALL_PATH}/bin/srv/netdata" || exit 1 - -cat >"${NETDATA_INSTALL_PATH}/bin/netdata" <"${NETDATA_MAKESELF_PATH}/makeself.lsm.tmp" - -run "${NETDATA_MAKESELF_PATH}/makeself.sh" \ - --gzip \ - --complevel 9 \ - --notemp \ - --needroot \ - --target "${NETDATA_INSTALL_PATH}" \ - --header "${NETDATA_MAKESELF_PATH}/makeself-header.sh" \ - --lsm "${NETDATA_MAKESELF_PATH}/makeself.lsm.tmp" \ - --license "${NETDATA_MAKESELF_PATH}/makeself-license.txt" \ - --help-header "${NETDATA_MAKESELF_PATH}/makeself-help-header.txt" \ - "${NETDATA_INSTALL_PATH}" \ - "${NETDATA_INSTALL_PATH}.gz.run" \ - "netdata, the real-time performance and health monitoring system" \ - ./system/post-installer.sh \ - ${NULL} - -run rm "${NETDATA_MAKESELF_PATH}/makeself.lsm.tmp" - -# ----------------------------------------------------------------------------- -# copy it to the netdata build dir - -FILE="netdata-${VERSION}.gz.run" - -run mkdir -p artifacts -run mv "${NETDATA_INSTALL_PATH}.gz.run" "artifacts/${FILE}" - -[ -f netdata-latest.gz.run ] && rm netdata-latest.gz.run -run ln -s "artifacts/${FILE}" netdata-latest.gz.run - -echo >&2 "Self-extracting installer moved to 'artifacts/${FILE}'" -- cgit v1.2.3