summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorMauro Sardara <msardara@cisco.com>2019-12-11 16:05:28 +0100
committerMauro Sardara <msardara@cisco.com>2019-12-11 18:44:27 +0000
commit631e07d8a53e77370da5e0273ddfc66789de867d (patch)
tree861f05c35f2bd5cd65be09762d1770c97e873112 /scripts
parent0c9c060ab9e4fc3bc124f76edda4be194d5ce21c (diff)
[HICN-449] [HICN-430] Build sysrepo plugin. Update sysrepo and libyang dependencies for centos.
Change-Id: I92afec16346929e101e57466d5621e4ebe4dc4d2 Signed-off-by: Mauro Sardara <msardara@cisco.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/build-extras.sh5
-rw-r--r--scripts/build-packages.sh8
2 files changed, 7 insertions, 6 deletions
diff --git a/scripts/build-extras.sh b/scripts/build-extras.sh
index 9b768d55b..cbf2113ba 100644
--- a/scripts/build-extras.sh
+++ b/scripts/build-extras.sh
@@ -113,8 +113,6 @@ setup() {
echo ${DEPS_CENTOS} | xargs sudo yum install -y --nogpgcheck
sudo yum install devtoolset-7 pcre-devel
- c++ --version
-
CXX_COMPILER="/opt/rh/devtoolset-7/root/usr/bin/c++"
CC_COMPILER="/opt/rh/devtoolset-7/root/usr/bin/cc"
@@ -123,9 +121,6 @@ setup() {
export CC=${CC_COMPILER} CXX=${CXX_COMPILER}
fi
-
- # do nothing but check compiler version
- c++ --version
}
# Parameters:
diff --git a/scripts/build-packages.sh b/scripts/build-packages.sh
index 2205d6277..293b3df21 100644
--- a/scripts/build-packages.sh
+++ b/scripts/build-packages.sh
@@ -40,6 +40,8 @@ DEPS_UBUNTU="libparc-dev \
libvppinfra=${VPP_VERSION_DEB} \
libvppinfra-dev=${VPP_VERSION_DEB} \
vpp-plugin-core=${VPP_VERSION_DEB} \
+ libyang \
+ sysrepo \
python3-ply"
DEPS_CMAKE_UBUNTU="curl"
@@ -54,6 +56,8 @@ DEPS_CENTOS="vpp-devel-${VPP_VERSION_RPM} \
asio-devel \
libconfig-devel \
centos-release-scl \
+ libyang \
+ sysrepo \
devtoolset-7"
DEPS_CENTOS_NOVERSION="vpp-devel \
@@ -174,12 +178,14 @@ build_package() {
cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_APPS=ON ${SCRIPT_PATH}/..
make -j8 package
- rm -rf libtransport ctrl/libctrl
+ rm -rf libtransport ctrl/libhicnctrl
cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DBUILD_HICNPLUGIN=ON \
-DBUILD_LIBTRANSPORT=ON \
-DBUILD_APPS=ON \
+ -DBUILD_HICNLIGHT=OFF \
+ -DBUILD_SYSREPOPLUGIN=ON \
${SCRIPT_PATH}/..
make -j8 package