[HICN-654] Fix versioning.

- Add rc0 tag for release candidate packages pushed in hicn repo
- Fix version for centos and aarch64 packages

Signed-off-by: Mauro Sardara <msardara@cisco.com>
Change-Id: I0b04d8164690635c19a0d429fb383268b9d3318e

2 files changed, 48 insertions, 37 deletions

diff --git a/scripts/build-extras.sh b/scripts/build-extras.sh
index 948e2d15b..78a6ac98e 100644
--- a/scripts/build-extras.sh
+++ b/scripts/build-extras.sh
@@ -17,6 +17,18 @@ set -euxo pipefail
 SCRIPT_PATH=$( cd "$(dirname "${BASH_SOURCE}")" ; pwd -P )
 source ${SCRIPT_PATH}/functions.sh
 
+# Libparc and libmemif are still not available in Ubuntu 20, so
+# we remove it from the list for now.
+# TODO Remove it as soon as they are available.
+DEPS_UBUNTU=(${DEPS_UBUNTU[@]/"libmemif-dev"})
+DEPS_UBUNTU=(${DEPS_UBUNTU[@]/"libmemif"})
+DEPS_UBUNTU=(${DEPS_UBUNTU[@]/"libparc-dev"})
+
+DEPS_CENTOS=(${DEPS_CENTOS[@]/"libmemif-devel"})
+DEPS_CENTOS=(${DEPS_CENTOS[@]/"libmemif"})
+DEPS_CENTOS=(${DEPS_CENTOS[@]/"libparc-devel"})
+
+
 # Parameters:
 # $1 = Package name
 #
diff --git a/scripts/functions.sh b/scripts/functions.sh
index d047aa094..7258800b2 100644
--- a/scripts/functions.sh
+++ b/scripts/functions.sh
@@ -35,46 +35,45 @@ else
     exit 1
 fi
 
-VERSION_REGEX="s/v([0-9]+).([0-9]+)(.*)?-([0-9]+)-(g[0-9a-f]+)/\1.\2\3-release/g"
+VERSION_REGEX="s/v([0-9]+).([0-9]+)(.*)?-([0-9]+)-(g[0-9a-f]+)/\1.\2-release/g"
 VPP_VERSION_DEB=$(git describe --long --match "v*" | sed -E ${VERSION_REGEX})
 VPP_VERSION_RPM="${VPP_VERSION_DEB}.x86_64"
 
-BUILD_TOOLS_UBUNTU=""
-LIBSSL_LIBEVENT_UBUNTU=" "
-DEPS_UBUNTU="build-essential                    \
-             doxygen                            \
-             curl                               \
-             libparc-dev                        \
-             libmemif-dev                       \
-             libmemif                           \
-             libasio-dev                        \
-             libconfig-dev                      \
-             libcurl4-openssl-dev               \
-             collectd-dev                       \
-             libevent-dev                       \
-             libssl-dev                         \
-             ninja-build                        \
-             vpp=${VPP_VERSION_DEB}             \
-             vpp-dev=${VPP_VERSION_DEB}         \
-             libvppinfra=${VPP_VERSION_DEB}     \
-             libvppinfra-dev=${VPP_VERSION_DEB} \
-             vpp-plugin-core=${VPP_VERSION_DEB} \
-             python3-ply"
+DEPS_UBUNTU=("build-essential"
+             "doxygen"
+             "curl"
+             "libparc-dev"
+             "libmemif-dev"
+             "libmemif"
+             "libasio-dev"
+             "libconfig-dev"
+             "libcurl4-openssl-dev"
+             "collectd-dev"
+             "libevent-dev"
+             "libssl-dev"
+             "ninja-build"
+             "vpp=${VPP_VERSION_DEB}"
+             "vpp-dev=${VPP_VERSION_DEB}"
+             "libvppinfra=${VPP_VERSION_DEB}"
+             "libvppinfra-dev=${VPP_VERSION_DEB}"
+             "vpp-plugin-core=${VPP_VERSION_DEB}"
+             "python3-ply")
 
 # BUILD_TOOLS_GROUP_CENTOS="'Development Tools'"
-DEPS_CENTOS="vpp-devel-${VPP_VERSION_RPM}   \
-             vpp-lib-${VPP_VERSION_RPM}     \
-             libparc-devel                  \
-             curl                           \
-             libmemif-devel                 \
-             ninja-build                    \
-             libmemif                       \
-             libcurl-devel                  \
-             asio-devel                     \
-             libconfig-devel                \
-             centos-release-scl             \
-             bzip2                          \
-             devtoolset-7"
+DEPS_CENTOS=("vpp-devel-${VPP_VERSION_RPM}"
+             "vpp-lib-${VPP_VERSION_RPM}"
+             "libparc-devel"
+             "curl"
+             "libmemif-devel"
+             "ninja-build"
+             "libmemif"
+             "libcurl-devel"
+             "asio-devel"
+             "libconfig-devel"
+             "centos-release-scl"
+             "bzip2"
+             "devtoolset-7"
+             "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"
@@ -123,9 +122,9 @@ function install_deps() {
     DISTRIB_ID=${ID}
 
     if [ ${DISTRIB_ID} == "ubuntu" ]; then
-        echo ${BUILD_TOOLS_UBUNTU} ${DEPS_UBUNTU} | xargs sudo ${apt_get} install -y --allow-unauthenticated --no-install-recommends
+        echo ${DEPS_UBUNTU[@]} | xargs sudo ${apt_get} install -y --allow-unauthenticated --no-install-recommends
     elif [ ${DISTRIB_ID} == "centos" ]; then
-        echo ${DEPS_CENTOS} | xargs sudo yum install -y --nogpgcheck
+        echo ${DEPS_CENTOS[@]} | xargs sudo yum install -y --nogpgcheck
         ${CXX_COMPILER} --version
         ${CC_COMPILER} --version
     fi