Revert libunwind being enabled in Docker and DEB builds. (#19450)
* Revert "Enable libunwind in Docker images. (#19409)" This reverts commit 361f6d256302d30cfa14da373f12471fdb7fff9a. * Revert "Enable libunwind in DEB native packages. (#19417)" This reverts commit 3d09660c48bc3f1d5a07c5875768868cd1c1767f.
Austin S. Hemmelgarn committed
Jan 21, 2025 at 10:12 UTC
0e0819668b92f28cd615188a85299af5561de7a9
2 files changed
-9
packaging/build-package.sh
-8
@@ -59,22 +59,14 @@ case "${PKG_TYPE}" in
59
amd64)
60
add_cmake_option ENABLE_PLUGIN_XENSTAT On
61
add_cmake_option ENABLE_PLUGIN_EBPF On
62
- add_cmake_option ENABLE_LIBUNWIND On
62
;;
63
arm64)
64
add_cmake_option ENABLE_PLUGIN_XENSTAT On
65
add_cmake_option ENABLE_PLUGIN_EBPF Off
67
- add_cmake_option ENABLE_LIBUNWIND On
68
- ;;
69
- armhf)
70
- add_cmake_option ENABLE_PLUGIN_XENSTAT Off
71
- add_cmake_option ENABLE_PLUGIN_EBPF Off
72
- add_cmake_option ENABLE_LIBUNWIND On
66
;;
67
*)
68
add_cmake_option ENABLE_PLUGIN_XENSTAT Off
69
add_cmake_option ENABLE_PLUGIN_EBPF Off
77
- add_cmake_option ENABLE_LIBUNWIND Off
70
;;
71
esac
72
;;
packaging/docker/Dockerfile
-1
@@ -27,7 +27,6 @@ WORKDIR /opt/netdata.git
27
RUN chmod +x netdata-installer.sh && \
28
cp -rp /deps/* /usr/local/ && \
29
/bin/echo -e "INSTALL_TYPE='oci'\nPREBUILT_ARCH='$(uname -m)'" > ./system/.install-type && \
30
- NETDATA_CMAKE_OPTIONS="$(dpkg-architecture --equal i386 || echo "-DENABLE_LIBUNWIND=On")" \
30
CFLAGS="$(packaging/docker/gen-cflags.sh)" LDFLAGS="-Wl,--gc-sections" ./netdata-installer.sh --dont-wait --dont-start-it --use-system-protobuf \
31
${EXTRA_INSTALL_OPTS} --disable-ebpf --install-no-prefix / "$([ "$RELEASE_CHANNEL" = stable ] && echo --stable-channel)"
32