mirror of
https://github.com/netdata/netdata.git
synced 2025-04-28 22:52:30 +00:00
Disable automake dependency tracking in our various one-time builds. (#12701)
* Disable automake dependency tracking in our various one-time builds. * Also disable dependency tracking code in package builds.
This commit is contained in:
parent
42f88e1b9c
commit
3f97fe0355
15 changed files with 25 additions and 17 deletions
1
.github/scripts/build-artifacts.sh
vendored
1
.github/scripts/build-artifacts.sh
vendored
|
@ -33,6 +33,7 @@ build_dist() {
|
||||||
--with-zlib \
|
--with-zlib \
|
||||||
--with-math \
|
--with-math \
|
||||||
--with-user=netdata \
|
--with-user=netdata \
|
||||||
|
--disable-dependency-tracking \
|
||||||
CFLAGS=-O2
|
CFLAGS=-O2
|
||||||
make dist
|
make dist
|
||||||
mv "${BASENAME}.tar.gz" artifacts/
|
mv "${BASENAME}.tar.gz" artifacts/
|
||||||
|
|
1
.github/scripts/build-dist.sh
vendored
1
.github/scripts/build-dist.sh
vendored
|
@ -32,6 +32,7 @@ build_dist() {
|
||||||
--with-zlib \
|
--with-zlib \
|
||||||
--with-math \
|
--with-math \
|
||||||
--with-user=netdata \
|
--with-user=netdata \
|
||||||
|
--disable-dependency-tracking \
|
||||||
CFLAGS=-O2
|
CFLAGS=-O2
|
||||||
make dist
|
make dist
|
||||||
mv "${BASENAME}.tar.gz" artifacts/
|
mv "${BASENAME}.tar.gz" artifacts/
|
||||||
|
|
|
@ -33,7 +33,7 @@ docker run \
|
||||||
-v "${PWD}:/netdata" \
|
-v "${PWD}:/netdata" \
|
||||||
-w /netdata \
|
-w /netdata \
|
||||||
"ubuntu:latest" \
|
"ubuntu:latest" \
|
||||||
/bin/bash -c "./install-required-packages.sh --dont-wait --non-interactive netdata && apt install wget && ./netdata-installer.sh --dont-wait --require-cloud --disable-telemetry --install /tmp && echo \"Validating netdata instance is running\" && wget -O - 'http://127.0.0.1:19999/api/v1/info' | grep version"
|
/bin/bash -c "./install-required-packages.sh --dont-wait --non-interactive netdata && apt install wget && ./netdata-installer.sh --dont-wait --require-cloud --disable-telemetry --install /tmp --one-time-build && echo \"Validating netdata instance is running\" && wget -O - 'http://127.0.0.1:19999/api/v1/info' | grep version"
|
||||||
popd || exit 1
|
popd || exit 1
|
||||||
|
|
||||||
echo "All Done!"
|
echo "All Done!"
|
||||||
|
|
8
.github/workflows/build.yml
vendored
8
.github/workflows/build.yml
vendored
|
@ -321,23 +321,23 @@ jobs:
|
||||||
id: build-basic
|
id: build-basic
|
||||||
run: |
|
run: |
|
||||||
docker run --security-opt seccomp=unconfined -w /netdata sha256:${{ steps.load.outputs.image }} \
|
docker run --security-opt seccomp=unconfined -w /netdata sha256:${{ steps.load.outputs.image }} \
|
||||||
/bin/sh -c 'autoreconf -ivf && ./configure && make -j2'
|
/bin/sh -c 'autoreconf -ivf && ./configure --disable-dependency-tracking && make -j2'
|
||||||
- name: netdata-installer on ${{ matrix.distro }}, disable cloud
|
- name: netdata-installer on ${{ matrix.distro }}, disable cloud
|
||||||
id: build-no-cloud
|
id: build-no-cloud
|
||||||
run: |
|
run: |
|
||||||
docker run --security-opt seccomp=unconfined -w /netdata sha256:${{ steps.load.outputs.image }} \
|
docker run --security-opt seccomp=unconfined -w /netdata sha256:${{ steps.load.outputs.image }} \
|
||||||
/bin/sh -c './netdata-installer.sh --dont-wait --dont-start-it --disable-cloud'
|
/bin/sh -c './netdata-installer.sh --dont-wait --dont-start-it --disable-cloud --one-time-build'
|
||||||
- name: netdata-installer on ${{ matrix.distro }}, require cloud
|
- name: netdata-installer on ${{ matrix.distro }}, require cloud
|
||||||
id: build-cloud
|
id: build-cloud
|
||||||
run: |
|
run: |
|
||||||
docker run --security-opt seccomp=unconfined -w /netdata sha256:${{ steps.load.outputs.image }} \
|
docker run --security-opt seccomp=unconfined -w /netdata sha256:${{ steps.load.outputs.image }} \
|
||||||
/bin/sh -c './netdata-installer.sh --dont-wait --dont-start-it --require-cloud'
|
/bin/sh -c './netdata-installer.sh --dont-wait --dont-start-it --require-cloud --one-time-build'
|
||||||
- name: netdata-installer on ${{ matrix.distro }}, require cloud, no JSON-C
|
- name: netdata-installer on ${{ matrix.distro }}, require cloud, no JSON-C
|
||||||
id: build-no-jsonc
|
id: build-no-jsonc
|
||||||
if: matrix.jsonc_removal != ''
|
if: matrix.jsonc_removal != ''
|
||||||
run: |
|
run: |
|
||||||
docker run --security-opt seccomp=unconfined -w /netdata sha256:${{ steps.load.outputs.image }} \
|
docker run --security-opt seccomp=unconfined -w /netdata sha256:${{ steps.load.outputs.image }} \
|
||||||
/bin/sh -c '/rmjsonc.sh && ./netdata-installer.sh --dont-wait --dont-start-it --require-cloud'
|
/bin/sh -c '/rmjsonc.sh && ./netdata-installer.sh --dont-wait --dont-start-it --require-cloud --one-time-build'
|
||||||
- name: Failure Notification
|
- name: Failure Notification
|
||||||
uses: rtCamp/action-slack-notify@v2
|
uses: rtCamp/action-slack-notify@v2
|
||||||
env:
|
env:
|
||||||
|
|
4
.github/workflows/checks.yml
vendored
4
.github/workflows/checks.yml
vendored
|
@ -27,7 +27,7 @@ jobs:
|
||||||
apk del openssl openssl-dev;
|
apk del openssl openssl-dev;
|
||||||
apk add libressl libressl-dev;
|
apk add libressl libressl-dev;
|
||||||
autoreconf -ivf;
|
autoreconf -ivf;
|
||||||
./configure;
|
./configure --disable-dependency-trackiong;
|
||||||
make;'
|
make;'
|
||||||
clang-checks:
|
clang-checks:
|
||||||
name: Clang
|
name: Clang
|
||||||
|
@ -51,7 +51,7 @@ jobs:
|
||||||
- name: Prepare environment
|
- name: Prepare environment
|
||||||
run: ./packaging/installer/install-required-packages.sh --dont-wait --non-interactive netdata
|
run: ./packaging/installer/install-required-packages.sh --dont-wait --non-interactive netdata
|
||||||
- name: Build netdata
|
- name: Build netdata
|
||||||
run: ./netdata-installer.sh --dont-start-it --disable-telemetry --dont-wait --install /tmp/install
|
run: ./netdata-installer.sh --dont-start-it --disable-telemetry --dont-wait --install /tmp/install --one-time-build
|
||||||
- name: Check that repo is clean
|
- name: Check that repo is clean
|
||||||
run: |
|
run: |
|
||||||
git status --porcelain=v1 > /tmp/porcelain
|
git status --porcelain=v1 > /tmp/porcelain
|
||||||
|
|
2
.github/workflows/tests.yml
vendored
2
.github/workflows/tests.yml
vendored
|
@ -57,7 +57,7 @@ jobs:
|
||||||
- name: Configure
|
- name: Configure
|
||||||
run: |
|
run: |
|
||||||
autoreconf -ivf
|
autoreconf -ivf
|
||||||
./configure --disable-ml
|
./configure --disable-ml --disable-dependency-tracking
|
||||||
# XXX: Work-around for bug with libbson-1.0 in Ubuntu 18.04
|
# XXX: Work-around for bug with libbson-1.0 in Ubuntu 18.04
|
||||||
# See: https://bugs.launchpad.net/ubuntu/+source/libmongoc/+bug/1790771
|
# See: https://bugs.launchpad.net/ubuntu/+source/libmongoc/+bug/1790771
|
||||||
# https://jira.mongodb.org/browse/CDRIVER-2818
|
# https://jira.mongodb.org/browse/CDRIVER-2818
|
||||||
|
|
|
@ -41,7 +41,7 @@ override_dh_auto_configure:
|
||||||
autoreconf -ivf
|
autoreconf -ivf
|
||||||
dh_auto_configure -- --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib \
|
dh_auto_configure -- --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib \
|
||||||
--libexecdir=/usr/libexec --with-user=netdata --with-math --with-zlib --with-webdir=/var/lib/netdata/www \
|
--libexecdir=/usr/libexec --with-user=netdata --with-math --with-zlib --with-webdir=/var/lib/netdata/www \
|
||||||
$(EBPF_CONFIG)
|
--disable-dependency-tracking $(EBPF_CONFIG)
|
||||||
|
|
||||||
override_dh_install:
|
override_dh_install:
|
||||||
cp -v $(BASE_CONFIG) debian/netdata.conf
|
cp -v $(BASE_CONFIG) debian/netdata.conf
|
||||||
|
|
|
@ -343,6 +343,7 @@ while [ -n "${1}" ]; do
|
||||||
"--enable-ebpf") NETDATA_DISABLE_EBPF=0 ;;
|
"--enable-ebpf") NETDATA_DISABLE_EBPF=0 ;;
|
||||||
"--disable-ebpf") NETDATA_DISABLE_EBPF=1 NETDATA_CONFIGURE_OPTIONS="$(echo "${NETDATA_CONFIGURE_OPTIONS%--disable-ebpf)}" | sed 's/$/ --disable-ebpf/g')" ;;
|
"--disable-ebpf") NETDATA_DISABLE_EBPF=1 NETDATA_CONFIGURE_OPTIONS="$(echo "${NETDATA_CONFIGURE_OPTIONS%--disable-ebpf)}" | sed 's/$/ --disable-ebpf/g')" ;;
|
||||||
"--skip-available-ram-check") SKIP_RAM_CHECK=1 ;;
|
"--skip-available-ram-check") SKIP_RAM_CHECK=1 ;;
|
||||||
|
"--one-time-build") NETDATA_CONFIGURE_OPTIONS="$(echo "${NETDATA_CONFIGURE_OPTIONS%--disable-dependency-tracking)}" | sed 's/$/ --disable-dependency-tracking/g')" ;;
|
||||||
"--disable-cloud")
|
"--disable-cloud")
|
||||||
if [ -n "${NETDATA_REQUIRE_CLOUD}" ]; then
|
if [ -n "${NETDATA_REQUIRE_CLOUD}" ]; then
|
||||||
echo "Cloud explicitly enabled, ignoring --disable-cloud."
|
echo "Cloud explicitly enabled, ignoring --disable-cloud."
|
||||||
|
@ -711,7 +712,7 @@ build_judy() {
|
||||||
run ${env_cmd} autoheader &&
|
run ${env_cmd} autoheader &&
|
||||||
run ${env_cmd} automake --add-missing --force --copy --include-deps &&
|
run ${env_cmd} automake --add-missing --force --copy --include-deps &&
|
||||||
run ${env_cmd} autoconf &&
|
run ${env_cmd} autoconf &&
|
||||||
run ${env_cmd} ./configure &&
|
run ${env_cmd} ./configure --disable-dependency-tracking &&
|
||||||
run ${env_cmd} ${make} ${MAKEOPTS} -C src &&
|
run ${env_cmd} ${make} ${MAKEOPTS} -C src &&
|
||||||
run ${env_cmd} ar -r src/libJudy.a src/Judy*/*.o; then
|
run ${env_cmd} ar -r src/libJudy.a src/Judy*/*.o; then
|
||||||
cd - > /dev/null || return 1
|
cd - > /dev/null || return 1
|
||||||
|
|
|
@ -272,7 +272,8 @@ autoreconf -ivf
|
||||||
--libdir="%{_libdir}" \
|
--libdir="%{_libdir}" \
|
||||||
--with-zlib \
|
--with-zlib \
|
||||||
--with-math \
|
--with-math \
|
||||||
--with-user=netdata
|
--with-user=netdata \
|
||||||
|
--disable-dependency-tracking
|
||||||
|
|
||||||
# Build step
|
# Build step
|
||||||
%{__make} %{?_smp_mflags}
|
%{__make} %{?_smp_mflags}
|
||||||
|
|
|
@ -14,7 +14,7 @@ aclocal || exit 1
|
||||||
autoheader || exit 1
|
autoheader || exit 1
|
||||||
automake --add-missing --force --copy --include-deps || exit 1
|
automake --add-missing --force --copy --include-deps || exit 1
|
||||||
autoconf || exit 1
|
autoconf || exit 1
|
||||||
./configure || exit 1
|
./configure --disable-dependncy-tracking || exit 1
|
||||||
make -C src || exit 1
|
make -C src || exit 1
|
||||||
ar -r src/libJudy.a src/Judy*/*.o || exit 1
|
ar -r src/libJudy.a src/Judy*/*.o || exit 1
|
||||||
cd "${OLDPWD}" || exit 1
|
cd "${OLDPWD}" || exit 1
|
||||||
|
|
|
@ -27,7 +27,7 @@ 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-installer.sh --dont-wait --dont-start-it --use-system-protobuf ${EXTRA_INSTALL_OPTS} \
|
./netdata-installer.sh --dont-wait --dont-start-it --use-system-protobuf ${EXTRA_INSTALL_OPTS} \
|
||||||
"$([ "$RELEASE_CHANNEL" = stable ] && echo --stable-channel)"
|
--one-time-build "$([ "$RELEASE_CHANNEL" = stable ] && echo --stable-channel)"
|
||||||
|
|
||||||
# files to one directory
|
# files to one directory
|
||||||
RUN mkdir -p /app/usr/sbin/ \
|
RUN mkdir -p /app/usr/sbin/ \
|
||||||
|
|
|
@ -20,7 +20,8 @@ run ./configure \
|
||||||
--enable-array-variables \
|
--enable-array-variables \
|
||||||
--disable-progcomp \
|
--disable-progcomp \
|
||||||
--disable-profiling \
|
--disable-profiling \
|
||||||
--disable-nls
|
--disable-nls \
|
||||||
|
--disable-dependency-tracking
|
||||||
|
|
||||||
run make clean
|
run make clean
|
||||||
run make -j "$(nproc)"
|
run make -j "$(nproc)"
|
||||||
|
|
|
@ -37,7 +37,8 @@ run ./configure \
|
||||||
--enable-ipv6 \
|
--enable-ipv6 \
|
||||||
--enable-cookies \
|
--enable-cookies \
|
||||||
--with-ca-fallback \
|
--with-ca-fallback \
|
||||||
--with-openssl
|
--with-openssl \
|
||||||
|
--disable-dependency-tracking
|
||||||
|
|
||||||
# Curl autoconf does not honour the curl_LDFLAGS environment variable
|
# Curl autoconf does not honour the curl_LDFLAGS environment variable
|
||||||
run sed -i -e "s/LDFLAGS =/LDFLAGS = -all-static/" src/Makefile
|
run sed -i -e "s/LDFLAGS =/LDFLAGS = -all-static/" src/Makefile
|
||||||
|
|
|
@ -17,7 +17,8 @@ export PKG_CONFIG_PATH="/openssl-static/lib/pkgconfig"
|
||||||
run ./configure \
|
run ./configure \
|
||||||
--prefix="${NETDATA_INSTALL_PATH}" \
|
--prefix="${NETDATA_INSTALL_PATH}" \
|
||||||
--enable-ipv4 \
|
--enable-ipv4 \
|
||||||
--enable-ipv6
|
--enable-ipv6 \
|
||||||
|
--disable-dependency-tracking
|
||||||
|
|
||||||
cat > doc/Makefile << EOF
|
cat > doc/Makefile << EOF
|
||||||
all:
|
all:
|
||||||
|
|
|
@ -32,7 +32,8 @@ run ./netdata-installer.sh \
|
||||||
--dont-start-it \
|
--dont-start-it \
|
||||||
--require-cloud \
|
--require-cloud \
|
||||||
--use-system-protobuf \
|
--use-system-protobuf \
|
||||||
--dont-scrub-cflags-even-though-it-may-break-things
|
--dont-scrub-cflags-even-though-it-may-break-things \
|
||||||
|
--one-time-build
|
||||||
|
|
||||||
# shellcheck disable=SC2015
|
# shellcheck disable=SC2015
|
||||||
[ "${GITHUB_ACTIONS}" = "true" ] && echo "::group::Finishing netdata install" || true
|
[ "${GITHUB_ACTIONS}" = "true" ] && echo "::group::Finishing netdata install" || true
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue