proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-04-29 12:18:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8187 from opensourcerouting/rpmfixes-75

Browse Source 
[7.5] CentOS Doc Fixes
This commit is contained in:
Lou Berger 2021-03-03 20:43:30 -05:00 committed by GitHub
commit f4ed841b8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/developer/building-frr-for-centos7.rst
View File

@ -14,14 +14,20 @@ CentOS 7 restrictions:
Install required packages Install required packages
------------------------- -------------------------
Add EPEL Repository:
::
sudo yum -y install epel-release
Add packages: 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 \ readline-devel texinfo net-snmp-devel groff pkgconfig \
json-c-devel pam-devel bison flex pytest c-ares-devel \ 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 .. include:: building-libyang.rst

16
doc/developer/packaging-redhat.rst
View File

@ -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 You should enable ``PowerTools`` repo if using CentOS 8 which
is disabled by default. 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 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 cd frr
./bootstrap.sh ./bootstrap.sh
@ -56,7 +62,7 @@ Tested on CentOS 6, CentOS 7, CentOS 8 and Fedora 24.
The only ``configure`` option respected when building RPMs is The only ``configure`` option respected when building RPMs is
``--with-pkg-extra-version``. ``--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
mkdir rpmbuild/SOURCES mkdir rpmbuild/SOURCES
@ -64,7 +70,7 @@ Tested on CentOS 6, CentOS 7, CentOS 8 and Fedora 24.
cp redhat/*.spec rpmbuild/SPECS/ cp redhat/*.spec rpmbuild/SPECS/
cp frr*.tar.gz rpmbuild/SOURCES/ 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 Look at the beginning of the file and adjust the following parameters to
enable or disable features as required:: 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_pimd: %global with_pimd 1 }
%{!?with_rpki: %global with_rpki 0 } %{!?with_rpki: %global with_rpki 0 }
8. Build the RPM:: 9. Build the RPM::
rpmbuild --define "_topdir `pwd`/rpmbuild" -ba rpmbuild/SPECS/frr.spec rpmbuild --define "_topdir `pwd`/rpmbuild" -ba rpmbuild/SPECS/frr.spec

2
redhat/frr.spec.in
View File

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