From db76bbc76c8d2cb2d817df8c9233937d230a1ff2 Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Thu, 4 Feb 2021 13:37:30 +0100 Subject: [HICN-681] Remove compilation warning in ubuntu 20.04 jobs. Signed-off-by: Mauro Sardara Change-Id: Id9666941d2a84d5deb75716a410abe9305923531 Signed-off-by: Mauro Sardara --- scripts/functions.sh | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'scripts/functions.sh') diff --git a/scripts/functions.sh b/scripts/functions.sh index adf3fd1fc..19b69e302 100644 --- a/scripts/functions.sh +++ b/scripts/functions.sh @@ -50,7 +50,6 @@ DEPS_UBUNTU=("build-essential" "libasio-dev" "libconfig-dev" "libcurl4-openssl-dev" - "collectd-dev" "libevent-dev" "libssl-dev" "ninja-build" @@ -78,20 +77,17 @@ DEPS_CENTOS=("vpp-devel-${VPP_VERSION_RPM}" "rpm-build") LATEST_EPEL_REPO="http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" -COLLECTD_SOURCE="https://storage.googleapis.com/collectd-tarballs/collectd-5.9.2.tar.bz2" +COLLECTD_SOURCE="https://github.com/collectd/collectd/releases/download/collectd-5.12.0/collectd-5.12.0.tar.bz2" function install_collectd_headers() { - DISTRIB_ID=${ID} - if [ "${DISTRIB_ID}" == "centos" ]; then - curl -OL ${COLLECTD_SOURCE} - tar -xf collectd-5.9.2.tar.bz2 + curl -OL ${COLLECTD_SOURCE} + tar -xf collectd-5.12.0.tar.bz2 - pushd collectd-5.9.2 - ./configure && make -j$(nproc) - popd + pushd collectd-5.12.0 + ./configure && make -j$(nproc) + popd - export COLLECTD_HOME=${PWD}/collectd-5.9.2/src - fi + export COLLECTD_HOME=${PWD}/collectd-5.12.0/src } function install_cmake() { -- cgit 1.2.3-korg