diff options
| author |   Alberto Compagno <acompagn+fdio@cisco.com> | 2019-12-11 09:57:58 +0100 |
|---|---|---|
| committer | Aberto Compagno <acompagn+fdio@cisco.com> | 2020-01-30 08:21:50 +0000 |
| commit | 38682396416f315fb5c5b0f8c25beb7a6a909d4f (patch) | |
| tree | 9b56f4835a8936252f87bc19a27432b4bb8587c0 /scripts | |
| parent | fa11d711aaab5e4cba7e89dcc896866f3e73db3f (diff) | |
[HICN-445] Update to vpp 20.01
Change-Id: I19a442080b6ca8b0477a8f92f161282288c395ee
Signed-off-by: Alberto Compagno <acompagn+fdio@cisco.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build-extras.sh | 6 | ||||
| -rw-r--r-- | scripts/build-packages.sh | 26 |
2 files changed, 24 insertions, 8 deletions
diff --git a/scripts/build-extras.sh b/scripts/build-extras.sh index cbf2113ba..4112298a8 100644 --- a/scripts/build-extras.sh +++ b/scripts/build-extras.sh @@ -22,10 +22,10 @@ PACKAGECLOUD_RELEASE_REPO_DEB="https://packagecloud.io/install/repositories/fdio PACKAGECLOUD_RELEASE_REPO_RPM="https://packagecloud.io/install/repositories/fdio/release/script.rpm.sh" VPP_GIT_REPO="https://git.fd.io/vpp" -VPP_BRANCH="stable/1908" +VPP_BRANCH="stable/2001" -VPP_VERSION_DEB="19.08.1-release" -VPP_VERSION_RPM="19.08.1-release.x86_64" +VPP_VERSION_DEB="20.01-release" +VPP_VERSION_RPM="20.01-release.x86_64" BUILD_TOOLS_UBUNTU="build-essential doxygen" LIBSSL_LIBEVENT_UBUNTU="libevent-dev libssl-dev" diff --git a/scripts/build-packages.sh b/scripts/build-packages.sh index 3efd92cc4..6ec32c0a7 100644 --- a/scripts/build-packages.sh +++ b/scripts/build-packages.sh @@ -22,10 +22,10 @@ PACKAGECLOUD_RELEASE_REPO_DEB="https://packagecloud.io/install/repositories/fdio PACKAGECLOUD_RELEASE_REPO_RPM="https://packagecloud.io/install/repositories/fdio/release/script.rpm.sh" VPP_GIT_REPO="https://git.fd.io/vpp" -VPP_BRANCH="stable/1908" +VPP_BRANCH="stable/2001" -VPP_VERSION_DEB="19.08.1-release" -VPP_VERSION_RPM="19.08.1-release.x86_64" +VPP_VERSION_DEB="20.01-release" +VPP_VERSION_RPM="20.01-release.x86_64" BUILD_TOOLS_UBUNTU="build-essential doxygen" LIBSSL_LIBEVENT_UBUNTU="libevent-dev libssl-dev" @@ -44,6 +44,22 @@ DEPS_UBUNTU="libparc-dev \ sysrepo \ python3-ply" + +DEPS_UBUNTU_NOVERSION="libparc-dev \ + libmemif-dev \ + libmemif \ + libasio-dev \ + libconfig-dev \ + libcurl4-openssl-dev \ + vpp \ + vpp-dev \ + libvppinfra \ + libvppinfra-dev \ + vpp-plugin-core \ + libyang \ + sysrepo \ + python3-ply" + DEPS_CMAKE_UBUNTU="curl" # BUILD_TOOLS_GROUP_CENTOS="'Development Tools'" @@ -102,7 +118,7 @@ setup_fdio_repo() { if [ "${DISTRIB_ID}" == "ubuntu" ]; then rm -r /etc/apt/sources.list.d/* - curl -s ${PACKAGECLOUD_RELEASE_REPO_DEB} | sudo bash + curl -s ${PACKAGECLOUD_RELEASE_REPO_DEB} | sudo bash elif [ "${DISTRIB_ID}" == "centos" ]; then curl -s ${PACKAGECLOUD_RELEASE_REPO_RPM} | sudo bash curl ${LATEST_EPEL_REPO} > epel-release-latest-7.noarch.rpm @@ -140,7 +156,7 @@ setup() { # Install dependencies if [ ${DISTRIB_ID} == "ubuntu" ]; then - echo ${BUILD_TOOLS_UBUNTU} ${DEPS_UBUNTU} | xargs sudo ${apt_get} install -y --allow-unauthenticated --no-install-recommends + echo ${BUILD_TOOLS_UBUNTU} ${DEPS_UBUNTU_NOVERSION} | xargs sudo ${apt_get} install -y --allow-unauthenticated --no-install-recommends elif [ ${DISTRIB_ID} == "centos" ]; then # echo ${BUILD_TOOLS_GROUP_CENTOS} | xargs sudo yum groupinstall -y --nogpgcheck echo ${DEPS_CENTOS} | xargs sudo yum install -y --nogpgcheck |