diff options
| author |   Enrico Loparco (eloparco) <eloparco@cisco.com> | 2021-06-24 09:15:41 +0200 |
|---|---|---|
| committer | Enrico Loparco (eloparco) <eloparco@cisco.com> | 2021-06-24 09:15:41 +0200 |
| commit | 229385955109b866a23c4ac2aa03d4d11044c39d (patch) | |
| tree | 0591f9c2fc4144d62330337cc2b94c63dfeded54 /scripts | |
| parent | 6ffbb5ed61733b8dbef39b1a9d437e899e9359d7 (diff) | |
[HICN-708] Rebase with master
Signed-off-by: Enrico Loparco (eloparco) <eloparco@cisco.com>
Change-Id: I2122e1d61dd3b2e039972624ffbdbcb3c5610159
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build-packages.sh | 12 | ||||
| -rw-r--r-- | scripts/functions.sh | 10 |
2 files changed, 19 insertions, 3 deletions
diff --git a/scripts/build-packages.sh b/scripts/build-packages.sh index efc1b6717..781dbc9bd 100644 --- a/scripts/build-packages.sh +++ b/scripts/build-packages.sh @@ -30,9 +30,17 @@ function build_package() { # Make the package mkdir -p ${SCRIPT_PATH}/../build && pushd ${SCRIPT_PATH}/../build rm -rf * - # First round - cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_APPS=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 + find . -not -name '*.deb' -not -name '*.rpm' -print0 | xargs -0 rm -rf -- || true rm *Unspecified* || true popd diff --git a/scripts/functions.sh b/scripts/functions.sh index 7796935ef..9cb62b5cc 100644 --- a/scripts/functions.sh +++ b/scripts/functions.sh @@ -49,14 +49,22 @@ DEPS_UBUNTU=("build-essential" "libmemif" "libasio-dev" "libconfig-dev" + "libconfig++-dev" "libcurl4-openssl-dev" "libevent-dev" "libssl-dev" "ninja-build" + "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") # BUILD_TOOLS_GROUP_CENTOS="'Development Tools'" -DEPS_CENTOS=("libparc-devel" +DEPS_CENTOS=("vpp-devel-${VPP_VERSION_RPM}" + "vpp-lib-${VPP_VERSION_RPM}" + "libparc-devel" "curl" "libmemif-devel" "ninja-build" |