From db3ac9d4f33b27d122be6fa6b15fab74a5a60090 Mon Sep 17 00:00:00 2001 From: Christian Hopps Date: Sat, 6 Jan 2024 06:55:04 -0500 Subject: [PATCH] build: require libyang 2.1.128 Update building docs to reflect this as well. Signed-off-by: Christian Hopps --- configure.ac | 8 ++------ doc/developer/building-frr-for-centos6.rst | 2 +- doc/developer/building-frr-for-opensuse.rst | 4 +++- doc/developer/building-frr-for-ubuntu2204.rst | 5 +++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index a3b0370ec056..1f87c9066d69 100644 --- a/configure.ac +++ b/configure.ac @@ -1954,12 +1954,8 @@ dnl --------------- dnl libyang dnl --------------- PKG_CHECK_MODULES([LIBYANG], [libyang >= 2.1.128], , [ - AC_MSG_WARN([Recommended libyang version is >= 2.1.128.]) -]) - -PKG_CHECK_MODULES([LIBYANG], [libyang >= 2.0.0], , [ - AC_MSG_ERROR([libyang (>= 2.0.0) was not found on your system.]) -]) +AC_MSG_ERROR([m4_normalize([libyang >= 2.1.128 is required, and was not found on your system. +Pleaes consult doc/developer/building-libyang.rst for instructions on installing or building libyang.])])]) ac_cflags_save="$CFLAGS" CFLAGS="$CFLAGS $LIBYANG_CFLAGS" AC_CHECK_MEMBER([struct lyd_node.priv], [], [ diff --git a/doc/developer/building-frr-for-centos6.rst b/doc/developer/building-frr-for-centos6.rst index 233d089f7957..fb796e491e81 100644 --- a/doc/developer/building-frr-for-centos6.rst +++ b/doc/developer/building-frr-for-centos6.rst @@ -124,7 +124,7 @@ Install libyang and its dependencies: sudo yum install pcre-devel doxygen cmake git clone https://github.com/CESNET/libyang.git cd libyang - git checkout 090926a89d59a3c4000719505d563aaf6ac60f2 + git checkout v2.1.128 mkdir build ; cd build cmake -DENABLE_LYD_PRIV=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr -D CMAKE_BUILD_TYPE:String="Release" .. make build-rpm diff --git a/doc/developer/building-frr-for-opensuse.rst b/doc/developer/building-frr-for-opensuse.rst index 3ff445bcd062..6e9913de48db 100644 --- a/doc/developer/building-frr-for-opensuse.rst +++ b/doc/developer/building-frr-for-opensuse.rst @@ -13,11 +13,13 @@ Installing Dependencies zypper in git autoconf automake libtool make \ readline-devel texinfo net-snmp-devel groff pkgconfig libjson-c-devel\ pam-devel python3-pytest bison flex c-ares-devel python3-devel\ - python3-Sphinx perl patch libcap-devel libyang-devel \ + python3-Sphinx perl patch libcap-devel \ libelf-devel libunwind-devel protobuf-c .. include:: building-libunwind-note.rst +.. include:: building-libyang.rst + Building & Installing FRR ------------------------- diff --git a/doc/developer/building-frr-for-ubuntu2204.rst b/doc/developer/building-frr-for-ubuntu2204.rst index 4a8de280b52f..3ea625716d8f 100644 --- a/doc/developer/building-frr-for-ubuntu2204.rst +++ b/doc/developer/building-frr-for-ubuntu2204.rst @@ -16,11 +16,12 @@ Installing Dependencies libc-ares-dev python3-dev python3-sphinx \ install-info build-essential libsnmp-dev perl \ libcap-dev libelf-dev libunwind-dev \ - protobuf-c-compiler libprotobuf-c-dev \ - libyang2 libyang2-dev + protobuf-c-compiler libprotobuf-c-dev .. include:: building-libunwind-note.rst +.. include:: building-libyang.rst + GRPC ^^^^ If GRPC is enabled using ``--enable-grpc`` the following packages should be