diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-10-17 09:30:23 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-10-17 09:30:23 +0000 |
| commit | 517a443636daa1e8085cb4e5325524a54e8a8fd7 (patch) | |
| tree | 5352109cc7cd5122274ab0cfc1f887b685f04edf /packaging/makeself | |
| parent | Releasing debian version 1.42.4-1. (diff) | |
| download | netdata-517a443636daa1e8085cb4e5325524a54e8a8fd7.tar.xz netdata-517a443636daa1e8085cb4e5325524a54e8a8fd7.zip | |
Merging upstream version 1.43.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rwxr-xr-x | packaging/makeself/build-static.sh | 2 | ||||
| -rw-r--r-- | packaging/makeself/curl.version | 2 | ||||
| -rwxr-xr-x | packaging/makeself/jobs/70-netdata-git.install.sh | 3 | ||||
| -rw-r--r-- | packaging/makeself/openssl.version | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/packaging/makeself/build-static.sh b/packaging/makeself/build-static.sh index f9f635c7..0c46c12a 100755 --- a/packaging/makeself/build-static.sh +++ b/packaging/makeself/build-static.sh @@ -24,7 +24,7 @@ else exit 1 fi -DOCKER_IMAGE_NAME="netdata/static-builder" +DOCKER_IMAGE_NAME="netdata/static-builder:v1" if [ "${BUILDARCH}" != "$(uname -m)" ] && [ "$(uname -m)" = 'x86_64' ] && [ -z "${SKIP_EMULATION}" ]; then ${docker} run --rm --privileged multiarch/qemu-user-static --reset -p yes || exit 1 diff --git a/packaging/makeself/curl.version b/packaging/makeself/curl.version index 7bfa34ed..12ab47e6 100644 --- a/packaging/makeself/curl.version +++ b/packaging/makeself/curl.version @@ -1 +1 @@ -curl-8_2_1 +curl-8_4_0 diff --git a/packaging/makeself/jobs/70-netdata-git.install.sh b/packaging/makeself/jobs/70-netdata-git.install.sh index 67b8df10..62f0c822 100755 --- a/packaging/makeself/jobs/70-netdata-git.install.sh +++ b/packaging/makeself/jobs/70-netdata-git.install.sh @@ -12,7 +12,7 @@ else export CFLAGS="-static -O1 -pipe -ggdb -Wall -Wextra -Wformat-signedness -DNETDATA_INTERNAL_CHECKS=1 -I/openssl-static/include -I/libnetfilter-acct-static/include/libnetfilter_acct -I/usr/include/libmnl" fi -export LDFLAGS="-Wl,--gc-sections -Wl,-z,stack-size=$[8 * 1024 * 1024] -static -L/openssl-static/lib64 -L/libnetfilter-acct-static/lib -lnetfilter_acct -L/usr/lib -lmnl" +export LDFLAGS="-Wl,--gc-sections -static -L/openssl-static/lib64 -L/libnetfilter-acct-static/lib -lnetfilter_acct -L/usr/lib -lmnl" # We export this to 'yes', installer sets this to .environment. # The updater consumes this one, so that it can tell whether it should update a static install or a non-static one @@ -31,6 +31,7 @@ run ./netdata-installer.sh \ --install-prefix "${NETDATA_INSTALL_PARENT}" \ --dont-wait \ --dont-start-it \ + --disable-exporting-mongodb \ --require-cloud \ --use-system-protobuf \ --dont-scrub-cflags-even-though-it-may-break-things \ diff --git a/packaging/makeself/openssl.version b/packaging/makeself/openssl.version index fec11a1d..c4d4ea13 100644 --- a/packaging/makeself/openssl.version +++ b/packaging/makeself/openssl.version @@ -1 +1 @@ -openssl-3.1.2 +openssl-3.1.3 |