diff options
| author |   Mauro Sardara <msardara@cisco.com> | 2020-11-06 20:19:46 +0100 |
|---|---|---|
| committer | Mauro Sardara <msardara@cisco.com> | 2020-11-06 23:54:23 +0100 |
| commit | c1de1ea148175650dfeab648d946e3266fdee117 (patch) | |
| tree | 8cd771d5d18bcc35a54c809b1c5717be5c043acf /scripts/functions.sh | |
| parent | 7f2bbf5f6934be58c016f0159e497fa519d14372 (diff) | |
[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
Diffstat (limited to 'scripts/functions.sh')
| -rw-r--r-- | scripts/functions.sh | 73 |
1 files changed, 36 insertions, 37 deletions
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 |