mirror of
https://github.com/netdata/netdata.git
synced 2025-04-13 01:08:11 +00:00
Revert libunwind being enabled in Docker and DEB builds. (#19450)
* Revert "Enable libunwind in Docker images. (#19409)" This reverts commit361f6d2563
. * Revert "Enable libunwind in DEB native packages. (#19417)" This reverts commit3d09660c48
.
This commit is contained in:
parent
3d09660c48
commit
0e0819668b
2 changed files with 0 additions and 9 deletions
packaging
|
@ -59,22 +59,14 @@ case "${PKG_TYPE}" in
|
||||||
amd64)
|
amd64)
|
||||||
add_cmake_option ENABLE_PLUGIN_XENSTAT On
|
add_cmake_option ENABLE_PLUGIN_XENSTAT On
|
||||||
add_cmake_option ENABLE_PLUGIN_EBPF On
|
add_cmake_option ENABLE_PLUGIN_EBPF On
|
||||||
add_cmake_option ENABLE_LIBUNWIND On
|
|
||||||
;;
|
;;
|
||||||
arm64)
|
arm64)
|
||||||
add_cmake_option ENABLE_PLUGIN_XENSTAT On
|
add_cmake_option ENABLE_PLUGIN_XENSTAT On
|
||||||
add_cmake_option ENABLE_PLUGIN_EBPF Off
|
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_XENSTAT Off
|
||||||
add_cmake_option ENABLE_PLUGIN_EBPF Off
|
add_cmake_option ENABLE_PLUGIN_EBPF Off
|
||||||
add_cmake_option ENABLE_LIBUNWIND Off
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -27,7 +27,6 @@ WORKDIR /opt/netdata.git
|
||||||
RUN chmod +x netdata-installer.sh && \
|
RUN chmod +x netdata-installer.sh && \
|
||||||
cp -rp /deps/* /usr/local/ && \
|
cp -rp /deps/* /usr/local/ && \
|
||||||
/bin/echo -e "INSTALL_TYPE='oci'\nPREBUILT_ARCH='$(uname -m)'" > ./system/.install-type && \
|
/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 \
|
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)"
|
${EXTRA_INSTALL_OPTS} --disable-ebpf --install-no-prefix / "$([ "$RELEASE_CHANNEL" = stable ] && echo --stable-channel)"
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue