Merging upstream version 10.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 8 insertions, 27 deletions

diff --git a/doc/developer/building-frr-for-ubuntu2204.rst b/doc/developer/building-frr-for-ubuntu2204.rst
index 97bdf88..c898c3c 100644
--- a/doc/developer/building-frr-for-ubuntu2204.rst
+++ b/doc/developer/building-frr-for-ubuntu2204.rst
@@ -15,40 +15,21 @@ Installing Dependencies
       pkg-config libpam0g-dev libjson-c-dev bison flex \
       libc-ares-dev python3-dev python3-sphinx \
       install-info build-essential libsnmp-dev perl \
-      libcap-dev python2 libelf-dev libunwind-dev \
-      libyang2 libyang2-dev
+      libcap-dev libelf-dev libunwind-dev \
+      protobuf-c-compiler libprotobuf-c-dev
 
 .. include:: building-libunwind-note.rst
 
-Note that Ubuntu >= 20 no longer installs python 2.x, so it must be
-installed explicitly. Ensure that your system has a symlink named
-``/usr/bin/python`` pointing at ``/usr/bin/python3``.
+.. include:: building-libyang.rst
 
-.. code-block:: shell
-
-   sudo ln -s /usr/bin/python3 /usr/bin/python
-   python --version
-
-In addition, ``pip`` for python2 must be installed if you wish to run
-the FRR topotests. That version of ``pip`` is not available from the
-ubuntu apt repositories; in order to install it:
-
-.. code-block:: shell
-
-   curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py
-   sudo python2 ./get-pip.py
-
-   # And verify the installation
-   pip2 --version
-
-
-Protobuf
-^^^^^^^^
-This is optional
+GRPC
+^^^^
+If GRPC is enabled using ``--enable-grpc`` the following packages should be
+installed.
 
 .. code-block:: console
 
-   sudo apt-get install protobuf-c-compiler libprotobuf-c-dev
+   sudo apt-get install libgrpc++-dev protobuf-compiler-grpc
 
 
 Config Rollbacks