diff options
author | Alberto Compagno <acompagn+fdio@cisco.com> | 2019-09-24 13:28:37 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@fd.io> | 2019-09-24 13:28:37 +0000 |
commit | 7452ef6cb7be56a054f4bed2d1846ba874ab717c (patch) | |
tree | 2fe4f9f0a7f41909095caaf8c22b9b9b058b8a93 /scripts | |
parent | 70a51ce9c175019f8394f523100a3c7066d3a4bc (diff) | |
parent | a0da41b243661a039481d2c254d7db8f55f18d2b (diff) |
Merge "[HICN-279] Added libmemif packaging."
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/build-packages.sh | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/scripts/build-packages.sh b/scripts/build-packages.sh index 45e2ddf92..c9856a0a0 100644 --- a/scripts/build-packages.sh +++ b/scripts/build-packages.sh @@ -24,8 +24,8 @@ PACKAGECLOUD_RELEASE_REPO_RPM="https://packagecloud.io/install/repositories/fdio VPP_GIT_REPO="https://git.fd.io/vpp" VPP_BRANCH="stable/1908" -VPP_VERSION_DEB="19.08-release" -VPP_VERSION_RPM="19.08-release.x86_64" +VPP_VERSION_DEB="19.08.1-release" +VPP_VERSION_RPM="19.08.1-release.x86_64" BUILD_TOOLS_UBUNTU="build-essential doxygen" LIBSSL_LIBEVENT_UBUNTU="libevent-dev libssl-dev" @@ -73,19 +73,6 @@ setup_fdio_repo() { fi } -MEMIF_HOME="" -build_libmemif_static() { - git clone ${VPP_GIT_REPO} -b ${VPP_BRANCH} vpp - pushd vpp - sed 's/SHARED/STATIC/g' src/cmake/library.cmake -i - mkdir -p build-root/build-libmemif && pushd build-root/build-libmemif - cmake ../../extras/libmemif/ -DCMAKE_C_FLAGS="-fPIC" -DCMAKE_INSTALL_PREFIX=. - make install - MEMIF_HOME="$(pwd)" - popd - popd -} - setup() { # Figure out what system we are running on if [ -f /etc/os-release ]; then @@ -126,8 +113,6 @@ setup() { export CC=${CC_COMPILER} CXX=${CXX_COMPILER} fi - build_libmemif_static - # do nothing but check compiler version c++ --version } @@ -156,7 +141,6 @@ build_package() { -DBUILD_HICNEXTRAPLUGIN=ON \ -DBUILD_LIBTRANSPORT=ON \ -DBUILD_APPS=ON \ - -DLIBMEMIF_HOME=${MEMIF_HOME} \ ${SCRIPT_PATH}/.. make package |