Merge pull request #8187 from opensourcerouting/rpmfixes-75

[7.5] CentOS Doc Fixes

Author: louberger

doc/developer/building-frr-for-centos7.rst

@@ -14,14 +14,20 @@ CentOS 7 restrictions:
 Install required packages
 -------------------------
 
+Add EPEL Repository:
+
+::
+
+    sudo yum -y install epel-release
+
 Add packages:
 
 ::
 
-    sudo yum install git autoconf automake libtool make \
+    sudo yum install git autoconf automake libtool make cmake \
       readline-devel texinfo net-snmp-devel groff pkgconfig \
       json-c-devel pam-devel bison flex pytest c-ares-devel \
-      python-devel systemd-devel python-sphinx libcap-devel
+      python3-devel systemd-devel python3-sphinx libcap-devel
 
 .. include:: building-libyang.rst
 

doc/developer/packaging-redhat.rst

@@ -40,11 +40,17 @@ Tested on CentOS 6, CentOS 7, CentOS 8 and Fedora 24.
    You should enable ``PowerTools`` repo if using CentOS 8 which
    is disabled by default.
 
-4. Checkout FRR::
+4. Add librtr-devel. Install librtr-devel from rpm.frrouting.org
+   repository (See https://rpm.frrouting.org to add repository
+   if it's not yet added)
+
+      yum install librtr-devel
+
+5. Checkout FRR::
 
       git clone https://github.com/frrouting/frr.git frr
 
-5. Run Bootstrap and make distribution tar.gz::
+6. Run Bootstrap and make distribution tar.gz::
 
       cd frr
       ./bootstrap.sh
@@ -56,15 +62,15 @@ Tested on CentOS 6, CentOS 7, CentOS 8 and Fedora 24.
       The only ``configure`` option respected when building RPMs is
       ``--with-pkg-extra-version``.
 
-6. Create RPM directory structure and populate with sources::
+7. Create RPM directory structure and populate with sources::
 
      mkdir rpmbuild
      mkdir rpmbuild/SOURCES
      mkdir rpmbuild/SPECS
      cp redhat/*.spec rpmbuild/SPECS/
      cp frr*.tar.gz rpmbuild/SOURCES/
 
-7. Edit :file:`rpm/SPECS/frr.spec` with configuration as needed.
+8. Edit :file:`rpm/SPECS/frr.spec` with configuration as needed.
 
    Look at the beginning of the file and adjust the following parameters to
    enable or disable features as required::
@@ -89,7 +95,7 @@ Tested on CentOS 6, CentOS 7, CentOS 8 and Fedora 24.
       %{!?with_pimd:          %global  with_pimd          1 }
       %{!?with_rpki:          %global  with_rpki          0 }
 
-8. Build the RPM::
+9. Build the RPM::
 
       rpmbuild --define "_topdir `pwd`/rpmbuild" -ba rpmbuild/SPECS/frr.spec
 

redhat/frr.spec.in

@@ -758,7 +758,7 @@ sed -i 's/ -M rpki//' %{_sysconfdir}/frr/daemons
 
 
 %changelog
-* Tue Nov 2 2020 Donald Sharp <sharpd@nvidia.com> - 7.5
+* Mon Nov  2 2020 Donald Sharp <sharpd@nvidia.com> - 7.5
 - BFD
 - 	Profile support
 - 	Minimum ttl support