packaging cleanup after #15842 (#15857)
Ilya Mashchenko committed
Aug 21, 2023 at 17:27 UTC
2c46b3a631c56f50c1e5f213d7a1ec27889a6085
3 files changed
+2
-5
collectors/systemd-journal.plugin/systemd-journal.c
-3
@@ -557,9 +557,6 @@ int main(int argc __maybe_unused, char **argv __maybe_unused) {
557
error_log_errors_per_period = 100;
558
error_log_throttle_period = 3600;
559
560
- // initialize the threads
561
- netdata_threads_init_for_external_plugins(0); // set the default threads stack size here
562
-
560
uids = dictionary_create(0);
561
gids = dictionary_create(0);
562
packaging/docker/Dockerfile
+1
-1
@@ -28,7 +28,7 @@ WORKDIR /opt/netdata.git
28
RUN chmod +x netdata-installer.sh && \
29
cp -rp /deps/* /usr/local/ && \
30
/bin/echo -e "INSTALL_TYPE='oci'\nPREBUILT_ARCH='$(uname -m)'" > ./system/.install-type && \
31
- CFLAGS="$(packaging/docker/gen-cflags.sh)" LDFLAGS="-Wl,--gc-sections -Wl,-z,stack-size=8388608" ./netdata-installer.sh --dont-wait --dont-start-it --use-system-protobuf \
31
+ CFLAGS="$(packaging/docker/gen-cflags.sh)" LDFLAGS="-Wl,--gc-sections" ./netdata-installer.sh --dont-wait --dont-start-it --use-system-protobuf \
32
${EXTRA_INSTALL_OPTS} --one-time-build --enable-lto "$([ "$RELEASE_CHANNEL" = stable ] && echo --stable-channel)"
33
34
# files to one directory
packaging/makeself/jobs/70-netdata-git.install.sh
+1
-1
@@ -12,7 +12,7 @@ else
12
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"
13
fi
14
15
-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"
15
+export LDFLAGS="-Wl,--gc-sections -static -L/openssl-static/lib64 -L/libnetfilter-acct-static/lib -lnetfilter_acct -L/usr/lib -lmnl"
16
17
# We export this to 'yes', installer sets this to .environment.
18
# The updater consumes this one, so that it can tell whether it should update a static install or a non-static one