diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build-packages.sh | 20 | ||||
| -rw-r--r-- | scripts/functions.sh | 23 |
2 files changed, 11 insertions, 32 deletions
diff --git a/scripts/build-packages.sh b/scripts/build-packages.sh index f3e3ff678..781dbc9bd 100644 --- a/scripts/build-packages.sh +++ b/scripts/build-packages.sh @@ -31,20 +31,12 @@ function build_package() { mkdir -p ${SCRIPT_PATH}/../build && pushd ${SCRIPT_PATH}/../build rm -rf * - # First round - Without libmemif - cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_APPS=ON .. - ninja -j8 package - - # Second round - With Libmemif - rm -rf libtransport ctrl/libhicnctrl - cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/usr \ - -DBUILD_HICNPLUGIN=ON \ - -DBUILD_LIBTRANSPORT=ON \ - -DBUILD_APPS=ON \ - -DBUILD_HICNLIGHT=OFF \ - -DBUILD_SYSREPOPLUGIN=OFF \ - -DBUILD_TELEMETRY=ON \ - -DBUILD_WSPLUGIN=ON \ + cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_HICNPLUGIN=ON \ + -DBUILD_LIBTRANSPORT=ON \ + -DBUILD_APPS=ON \ + -DBUILD_HICNLIGHT=ON \ + -DBUILD_TELEMETRY=ON \ ${SCRIPT_PATH}/.. ninja -j8 package diff --git a/scripts/functions.sh b/scripts/functions.sh index 26c993f6d..9cb62b5cc 100644 --- a/scripts/functions.sh +++ b/scripts/functions.sh @@ -49,6 +49,7 @@ DEPS_UBUNTU=("build-essential" "libmemif" "libasio-dev" "libconfig-dev" + "libconfig++-dev" "libcurl4-openssl-dev" "libevent-dev" "libssl-dev" @@ -58,11 +59,7 @@ DEPS_UBUNTU=("build-essential" "libvppinfra=${VPP_VERSION_DEB}" "libvppinfra-dev=${VPP_VERSION_DEB}" "vpp-plugin-core=${VPP_VERSION_DEB}" - "python3-ply" - "wireshark" - "wireshark-dev" - "libgcrypt-dev" - "libgnutls28-dev") + "python3-ply") # BUILD_TOOLS_GROUP_CENTOS="'Development Tools'" DEPS_CENTOS=("vpp-devel-${VPP_VERSION_RPM}" @@ -77,9 +74,7 @@ DEPS_CENTOS=("vpp-devel-${VPP_VERSION_RPM}" "libconfig-devel" "dnf-plugins-core" "bzip2" - "rpm-build" - "wireshark-devel" - "libgcrypt-devel") + "rpm-build") COLLECTD_SOURCE="https://github.com/collectd/collectd/releases/download/collectd-5.12.0/collectd-5.12.0.tar.bz2" @@ -119,19 +114,12 @@ function setup_fdio_repo() { fi } -function setup_wireshark_repo() { - if [ ${DISTRIB_ID} == "ubuntu" ]; then - sudo add-apt-repository ppa:wireshark-dev/stable - sudo add-apt-repository universe - fi -} - # Install dependencies function install_deps() { DISTRIB_ID=${ID} if [ ${DISTRIB_ID} == "ubuntu" ]; then - echo ${DEPS_UBUNTU[@]} | xargs sudo DEBIAN_FRONTEND=noninteractive ${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 yum config-manager --set-enabled powertools # Temporary workaround until centos fixes the asio-devel package (https://forums.centos.org/viewtopic.php?t=73034) @@ -158,8 +146,7 @@ function setup() { # export variables depending on the platform we are running call_once setup_fdio_repo - call_once setup_wireshark_repo call_once install_deps call_once install_cmake call_once install_collectd_headers -}
\ No newline at end of file +} |