aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMarco Trinelli <marcotrinelli@gmail.com>2021-03-23 15:55:01 +0100
committerMarco Trinelli <marcotrinelli@gmail.com>2021-03-25 16:53:16 +0100
commit9f30bf6e794a7b431217ce91038a4ec0f917dc08 (patch)
tree32d58faf4e61045730e1fedc58153b979ce1e420 /scripts
parenteedc20451418af57a6ffe4c6d41652828f01b9fe (diff)
[HICN-688] Include packethicn in hicn build
Add license headers Add dependencies Fix build for Ubuntu 18.04 Move doc Signed-off-by: Marco Trinelli <marcotrinelli@gmail.com> Change-Id: Ie92268d2d3a47c47746107ac6f9c34b21949671c
Diffstat (limited to 'scripts')
-rw-r--r--scripts/build-packages.sh3
-rw-r--r--scripts/functions.sh22
2 files changed, 20 insertions, 5 deletions
diff --git a/scripts/build-packages.sh b/scripts/build-packages.sh
index c9f329d9a..f3e3ff678 100644
--- a/scripts/build-packages.sh
+++ b/scripts/build-packages.sh
@@ -42,8 +42,9 @@ function build_package() {
-DBUILD_LIBTRANSPORT=ON \
-DBUILD_APPS=ON \
-DBUILD_HICNLIGHT=OFF \
- -DBUILD_SYSREPOPLUGIN=OFF \
+ -DBUILD_SYSREPOPLUGIN=OFF \
-DBUILD_TELEMETRY=ON \
+ -DBUILD_WSPLUGIN=ON \
${SCRIPT_PATH}/..
ninja -j8 package
diff --git a/scripts/functions.sh b/scripts/functions.sh
index 5e98c2a55..26c993f6d 100644
--- a/scripts/functions.sh
+++ b/scripts/functions.sh
@@ -58,7 +58,11 @@ DEPS_UBUNTU=("build-essential"
"libvppinfra=${VPP_VERSION_DEB}"
"libvppinfra-dev=${VPP_VERSION_DEB}"
"vpp-plugin-core=${VPP_VERSION_DEB}"
- "python3-ply")
+ "python3-ply"
+ "wireshark"
+ "wireshark-dev"
+ "libgcrypt-dev"
+ "libgnutls28-dev")
# BUILD_TOOLS_GROUP_CENTOS="'Development Tools'"
DEPS_CENTOS=("vpp-devel-${VPP_VERSION_RPM}"
@@ -73,7 +77,9 @@ DEPS_CENTOS=("vpp-devel-${VPP_VERSION_RPM}"
"libconfig-devel"
"dnf-plugins-core"
"bzip2"
- "rpm-build")
+ "rpm-build"
+ "wireshark-devel"
+ "libgcrypt-devel")
COLLECTD_SOURCE="https://github.com/collectd/collectd/releases/download/collectd-5.12.0/collectd-5.12.0.tar.bz2"
@@ -113,12 +119,19 @@ 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 ${apt_get} install -y --allow-unauthenticated --no-install-recommends
+ echo ${DEPS_UBUNTU[@]} | xargs sudo DEBIAN_FRONTEND=noninteractive ${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)
@@ -145,7 +158,8 @@ 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