aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Sardara <msardara+fdio@cisco.com>2017-09-13 14:55:18 +0200
committerMauro Sardara <msardara+fdio@cisco.com>2017-09-13 15:20:48 +0200
commit691b4bb5305f42d06f2ad57633db3c170f7a9204 (patch)
treee20bb816a4a87cc0471381173e3b39899676e427
parenta408e921ab55158aa8ada1fdf85a59cc44b8d10e (diff)
Install correct version of the vpp-lib before building.
Change-Id: I8c210a133a89a2083ff9523055b9446dcd499f91 Signed-off-by: Mauro Sardara <msardara+fdio@cisco.com>
-rw-r--r--cicn-plugin/scripts/build-package.sh11
1 files changed, 8 insertions, 3 deletions
diff --git a/cicn-plugin/scripts/build-package.sh b/cicn-plugin/scripts/build-package.sh
index 25c03545..b29f2c29 100644
--- a/cicn-plugin/scripts/build-package.sh
+++ b/cicn-plugin/scripts/build-package.sh
@@ -9,12 +9,13 @@ apt_get=${APT_PATH:-"/usr/local/bin/apt-get"}
BUILD_TOOLS_UBUNTU="build-essential cmake"
LIBSSL_LIBEVENT_UBUNTU="libevent-dev libssl-dev"
-DEPS_UBUNTU="vpp-dev vpp-lib"
+DEPS_UBUNTU_16="vpp-dev=17.04.2-release vpp-lib=17.04.2-release"
+DEPS_UBUNTU_14="vpp-dev=17.04-release vpp-lib=17.04-release"
BUILD_TOOLS_GROUP_CENTOS="'Development Tools'"
BUILD_TOOLS_SINGLE_CENTOS="cmake"
LIBSSL_LIBEVENT_CENTOS="libevent-devel openssl-devel"
-DEPS_CENTOS="vpp-devel"
+DEPS_CENTOS="vpp-devel-17.04.2-release vpp-lib-17.04.2-release"
# Parameters:
# $1 = Distribution [Trusty / CentOS]
@@ -175,7 +176,11 @@ build_package() {
# Install package dependencies
if [ $DISTRIB_ID == "Ubuntu" ]; then
- echo $BUILD_TOOLS_UBUNTU $DEPS_UBUNTU | xargs sudo ${apt_get} install -y --allow-unauthenticated
+ if [ "$DISTRIB_CODENAME" == "xenial" ]; then
+ echo $BUILD_TOOLS_UBUNTU $DEPS_UBUNTU_16 | xargs sudo ${apt_get} install -y --allow-unauthenticated
+ elif [ "$DISTRIB_CODENAME" == "trusty" ]; then
+ echo $BUILD_TOOLS_UBUNTU $DEPS_UBUNTU_14 | xargs sudo ${apt_get} install -y --allow-unauthenticated
+ fi
elif [ $DISTRIB_ID == "CentOS" ]; then
echo $BUILD_TOOLS_GROUP_CENTOS | xargs sudo yum groupinstall -y --nogpgcheck
echo $BUILD_TOOLS_SINGLE_CENTOS | xargs sudo yum install -y --nogpgcheck