diff options
| author |   Alberto Compagno <acompagn+fdio@cisco.com> | 2019-10-30 09:32:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2019-10-30 09:32:52 +0000 |
| commit | 3d674d504306489c4d845260f058ce44aa083f33 (patch) | |
| tree | b53f1d98ee3709440d6dd580586c86ff78824cb2 | |
| parent | 12439a0131fa2c10d52a190fbb44ca54d0d3dc6e (diff) | |
| parent | 3ee27828fad5367503108060560943121da378cc (diff) | |
Merge "[HICN-366] Installing python3-ply"
| -rw-r--r-- | scripts/build-packages.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/build-packages.sh b/scripts/build-packages.sh index c9856a0a0..febb69bd4 100644 --- a/scripts/build-packages.sh +++ b/scripts/build-packages.sh @@ -29,7 +29,8 @@ VPP_VERSION_RPM="19.08.1-release.x86_64" BUILD_TOOLS_UBUNTU="build-essential doxygen" LIBSSL_LIBEVENT_UBUNTU="libevent-dev libssl-dev" -DEPS_UBUNTU="libparc-dev libasio-dev libconfig-dev libcurl4-openssl-dev vpp=${VPP_VERSION_DEB} vpp-dev=${VPP_VERSION_DEB} libvppinfra=${VPP_VERSION_DEB} libvppinfra-dev=${VPP_VERSION_DEB} vpp-plugin-core=${VPP_VERSION_DEB}" +DEPS_UBUNTU="libparc-dev libasio-dev libconfig-dev libcurl4-openssl-dev 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_CMAKE_UBUNTU="curl" # BUILD_TOOLS_GROUP_CENTOS="'Development Tools'" DEPS_CENTOS="vpp-devel-${VPP_VERSION_RPM} vpp-lib-${VPP_VERSION_RPM} libparc-devel libcurl-devel asio-devel libconfig-devel centos-release-scl devtoolset-7" @@ -37,6 +38,11 @@ DEPS_CENTOS_NOVERSION="vpp-devel vpp-lib libparc-devel libcurl-devel asio-devel LATEST_EPEL_REPO="http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm" install_cmake() { + if [ "${DISTRIB_ID}" == "ubuntu" ]; then + sudo apt update + echo ${DEPS_CMAKE_UBUNTU} | xargs sudo ${apt_get} install -y --allow-unauthenticated --no-install-recommends + fi + if ! grep -q "8.8.8.8" /etc/resolv.conf; then echo "nameserver 8.8.8.8" | sudo tee -a /etc/resolv.conf fi |