summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Westphal <renato@opensourcerouting.org>2019-04-05 03:53:27 +0200
committerRenato Westphal <renato@opensourcerouting.org>2019-07-02 03:59:54 +0200
commit716ffcc8fe63dcbe054ed1436ac3b47705e96d13 (patch)
tree5d4af20d2b4dd5e7ec7222a3e43cd71055529220
parentMerge pull request #4608 from donaldsharp/vtysh_pam_helping_hand (diff)
downloadfrr-716ffcc8fe63dcbe054ed1436ac3b47705e96d13.tar.xz
frr-716ffcc8fe63dcbe054ed1436ac3b47705e96d13.zip
build, lib: bump libyang requirement version to >= 0.16.105
After ~4 months of deprecation period [1], drop support for older libyang versions that don't support embedded extensions. In addition to support for embedded extensions, libyang 0.16-r3 contains several bug fixes and performance improvements compared to libyang-0.16-r1. It was about time to update. Fixes: * Issue #3273 * Issue #3971 [1] See commit 68626e08. Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
-rwxr-xr-xconfigure.ac15
-rw-r--r--doc/developer/building-libyang.rst2
-rw-r--r--doc/user/installation.rst16
3 files changed, 3 insertions, 30 deletions
diff --git a/configure.ac b/configure.ac
index 9b57c2ec9..45cb85ab8 100755
--- a/configure.ac
+++ b/configure.ac
@@ -139,13 +139,6 @@ AC_ARG_WITH([yangmodelsdir], [AS_HELP_STRING([--with-yangmodelsdir=DIR], [yang m
])
AC_SUBST([yangmodelsdir])
-AC_ARG_WITH([libyang_pluginsdir], [AS_HELP_STRING([--with-libyang-pluginsdir=DIR], [yangmodule plugins directory (${libdir}/frr/libyang_plugins)])], [
- libyang_pluginsdir="$withval"
-], [
- libyang_pluginsdir="\${libdir}/frr/libyang_plugins"
-])
-AC_SUBST([libyang_pluginsdir])
-
AC_ARG_ENABLE(tcmalloc,
AS_HELP_STRING([--enable-tcmalloc], [Turn on tcmalloc]),
[case "${enableval}" in
@@ -1608,8 +1601,8 @@ AC_SUBST([SNMP_CFLAGS])
dnl ---------------
dnl libyang
dnl ---------------
-PKG_CHECK_MODULES([LIBYANG], [libyang >= 0.16.7], , [
- AC_MSG_ERROR([libyang (>= 0.16.7) was not found on your system.])
+PKG_CHECK_MODULES([LIBYANG], [libyang >= 0.16.105], , [
+ AC_MSG_ERROR([libyang (>= 0.16.105) was not found on your system.])
])
ac_cflags_save="$CFLAGS"
CFLAGS="$CFLAGS $LIBYANG_CFLAGS"
@@ -2166,24 +2159,20 @@ CFG_SBIN="$sbindir"
CFG_STATE="$frr_statedir"
CFG_MODULE="$moduledir"
CFG_YANGMODELS="$yangmodelsdir"
-CFG_LIBYANG_PLUGINS="$libyang_pluginsdir"
for I in 1 2 3 4 5 6 7 8 9 10; do
eval CFG_SYSCONF="\"$CFG_SYSCONF\""
eval CFG_SBIN="\"$CFG_SBIN\""
eval CFG_STATE="\"$CFG_STATE\""
eval CFG_MODULE="\"$CFG_MODULE\""
eval CFG_YANGMODELS="\"$CFG_YANGMODELS\""
- eval CFG_LIBYANG_PLUGINS="\"$CFG_LIBYANG_PLUGINS\""
done
AC_SUBST([CFG_SYSCONF])
AC_SUBST([CFG_SBIN])
AC_SUBST([CFG_STATE])
AC_SUBST([CFG_MODULE])
AC_SUBST([CFG_YANGMODELS])
-AC_SUBST([CFG_LIBYANG_PLUGINS])
AC_DEFINE_UNQUOTED([MODULE_PATH], ["$CFG_MODULE"], [path to modules])
AC_DEFINE_UNQUOTED([YANG_MODELS_PATH], ["$CFG_YANGMODELS"], [path to YANG data models])
-AC_DEFINE_UNQUOTED([LIBYANG_PLUGINS_PATH], ["$CFG_LIBYANG_PLUGINS"], [path to libyang plugins])
AC_DEFINE_UNQUOTED([WATCHFRR_SH_PATH], ["${CFG_SBIN%/}/watchfrr.sh"], [path to watchfrr.sh])
dnl various features
diff --git a/doc/developer/building-libyang.rst b/doc/developer/building-libyang.rst
index ed3e02990..f50b8cf72 100644
--- a/doc/developer/building-libyang.rst
+++ b/doc/developer/building-libyang.rst
@@ -10,7 +10,7 @@ The FRR project builds binary ``libyang`` packages, which we offer for download
.. warning::
- ``libyang`` version 0.16.74 or newer is required to build FRR.
+ ``libyang`` version 0.16.105 or newer is required to build FRR.
.. note::
diff --git a/doc/user/installation.rst b/doc/user/installation.rst
index 64949fc8e..b45c83ca1 100644
--- a/doc/user/installation.rst
+++ b/doc/user/installation.rst
@@ -331,22 +331,6 @@ options to the configuration script.
Look for YANG modules in `dir` [`prefix`/share/yang]. Note that the FRR
YANG modules will be installed here.
-.. option:: --with-libyang-pluginsdir <dir>
-
- Look for libyang plugins in `dir` [`prefix`/lib/frr/libyang_plugins].
- Note that the FRR libyang plugins will be installed here.
-
- This option is meaningless with libyang 0.16.74 or newer and will be
- removed once support for older libyang versions is dropped.
-
-When it's desired to run FRR without installing it in the system, it's possible
-to configure it as follows to look for YANG modules and libyang plugins in the
-compile directory:
-.. code-block:: shell
-
- ./configure --with-libyang-pluginsdir="`pwd`/yang/libyang_plugins/.libs" \
- --with-yangmodelsdir="`pwd`/yang"
-
Python dependency, documentation and tests
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^