From 0e0819668b92f28cd615188a85299af5561de7a9 Mon Sep 17 00:00:00 2001
From: "Austin S. Hemmelgarn" <austin@netdata.cloud>
Date: Tue, 21 Jan 2025 10:12:14 -0500
Subject: [PATCH] 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.
---
packaging/build-package.sh | 8 --------
packaging/docker/Dockerfile | 1 -
2 files changed, 9 deletions(-)
diff --git a/packaging/build-package.sh b/packaging/build-package.sh
index cad88beb89..2948149851 100755
--- a/packaging/build-package.sh
+++ b/packaging/build-package.sh
@@ -59,22 +59,14 @@ case "${PKG_TYPE}" in
amd64)
add_cmake_option ENABLE_PLUGIN_XENSTAT On
add_cmake_option ENABLE_PLUGIN_EBPF On
- add_cmake_option ENABLE_LIBUNWIND On
;;
arm64)
add_cmake_option ENABLE_PLUGIN_XENSTAT On
add_cmake_option ENABLE_PLUGIN_EBPF Off
- add_cmake_option ENABLE_LIBUNWIND On
- ;;
- armhf)
- add_cmake_option ENABLE_PLUGIN_XENSTAT Off
- add_cmake_option ENABLE_PLUGIN_EBPF Off
- add_cmake_option ENABLE_LIBUNWIND On
;;
*)
add_cmake_option ENABLE_PLUGIN_XENSTAT Off
add_cmake_option ENABLE_PLUGIN_EBPF Off
- add_cmake_option ENABLE_LIBUNWIND Off
;;
esac
;;
diff --git a/packaging/docker/Dockerfile b/packaging/docker/Dockerfile
index de84274bee..1eda7e4b98 100644
--- a/packaging/docker/Dockerfile
+++ b/packaging/docker/Dockerfile
@@ -27,7 +27,6 @@ WORKDIR /opt/netdata.git
RUN chmod +x netdata-installer.sh && \
cp -rp /deps/* /usr/local/ && \
/bin/echo -e "INSTALL_TYPE='oci'\nPREBUILT_ARCH='$(uname -m)'" > ./system/.install-type && \
- NETDATA_CMAKE_OPTIONS="$(dpkg-architecture --equal i386 || echo "-DENABLE_LIBUNWIND=On")" \
CFLAGS="$(packaging/docker/gen-cflags.sh)" LDFLAGS="-Wl,--gc-sections" ./netdata-installer.sh --dont-wait --dont-start-it --use-system-protobuf \
${EXTRA_INSTALL_OPTS} --disable-ebpf --install-no-prefix / "$([ "$RELEASE_CHANNEL" = stable ] && echo --stable-channel)"