aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Sardara <msardara@cisco.com>2021-02-11 11:18:58 +0100
committerMauro Sardara <msardara@cisco.com>2021-02-11 10:35:11 +0000
commit5c98619ef3e6107bb9dafddb055dd35a374931f3 (patch)
tree1d93dc2028133df47891077300103ef8eed0e67a
parentb3b64c5a0529bbbbdcaf14f72fb47667bb457e9d (diff)
HICN-685 Fix package script for centos8
Signed-off-by: Mauro Sardara <msardara@cisco.com> Change-Id: I84c0461d5a7869b38a676f3a02a53080e32d271c
-rw-r--r--extras/libmemif/CMakeLists.txt2
-rw-r--r--scripts/functions.sh16
2 files changed, 3 insertions, 15 deletions
diff --git a/extras/libmemif/CMakeLists.txt b/extras/libmemif/CMakeLists.txt
index 11c87fe..3cb3a98 100644
--- a/extras/libmemif/CMakeLists.txt
+++ b/extras/libmemif/CMakeLists.txt
@@ -25,7 +25,7 @@ include(ExternalProject)
ExternalProject_Add(libmemif
GIT_REPOSITORY https://github.com/FDio/vpp.git
- GIT_TAG v20.09
+ GIT_TAG v21.01
GIT_SHALLOW TRUE
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/libmemif
PATCH_COMMAND bash -c "cp ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists1.patch ./extras/libmemif/CMakeLists.txt && cp ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists2.patch ./extras/libmemif/src/CMakeLists.txt"
diff --git a/scripts/functions.sh b/scripts/functions.sh
index 19b69e3..1e00d9e 100644
--- a/scripts/functions.sh
+++ b/scripts/functions.sh
@@ -71,12 +71,10 @@ DEPS_CENTOS=("vpp-devel-${VPP_VERSION_RPM}"
"libcurl-devel"
"asio-devel"
"libconfig-devel"
- "centos-release-scl"
+ "dnf-plugins-core"
"bzip2"
- "devtoolset-7"
"rpm-build")
-LATEST_EPEL_REPO="http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
COLLECTD_SOURCE="https://github.com/collectd/collectd/releases/download/collectd-5.12.0/collectd-5.12.0.tar.bz2"
function install_collectd_headers() {
@@ -109,8 +107,6 @@ function setup_fdio_repo() {
elif [ "${DISTRIB_ID}" == "centos" ]; then
curl -s ${PACKAGECLOUD_RELEASE_REPO_RPM} | sudo bash
curl -s ${PACKAGECLOUD_HICN_REPO_RPM} | sudo bash
- curl -L ${LATEST_EPEL_REPO} > /tmp/epel-release-latest-7.noarch.rpm
- rpm -ivh /tmp/epel-release-latest-7.noarch.rpm || true
else
echo "Distribution ${DISTRIB_ID} is not supported"
exit 1
@@ -124,9 +120,8 @@ function install_deps() {
if [ ${DISTRIB_ID} == "ubuntu" ]; then
echo ${DEPS_UBUNTU[@]} | xargs sudo ${apt_get} install -y --allow-unauthenticated --no-install-recommends
elif [ ${DISTRIB_ID} == "centos" ]; then
+ yum config-manager --set-enabled powertools
echo ${DEPS_CENTOS[@]} | xargs sudo yum install -y --nogpgcheck
- ${CXX_COMPILER} --version
- ${CC_COMPILER} --version
fi
}
@@ -146,13 +141,6 @@ function setup() {
echo DISTRIBUTION: ${PRETTY_NAME}
# export variables depending on the platform we are running
- if [ ${ID} == "centos" ]; then
- # Compilers location
- CXX_COMPILER="/opt/rh/devtoolset-7/root/usr/bin/c++"
- CC_COMPILER="/opt/rh/devtoolset-7/root/usr/bin/cc"
- export CC=${CC_COMPILER} CXX=${CXX_COMPILER}
- fi
-
call_once setup_fdio_repo
call_once install_deps
call_once install_cmake