diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build-extras.sh | 5 | ||||
| -rw-r--r-- | scripts/build-packages.sh | 8 |
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 |