diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-04-03 18:55:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-03 18:55:30 -0400 |
| commit | e61a754ca2543a25e13d6ab16aa064832a43dfaf (patch) | |
| tree | e79d7c225246384c336b8cc68f8b43e928ccf309 | |
| parent | ea4aa1428f20bb2a0338945fc38ebf382abc0100 (diff) | |
| parent | 208bf70046b20489eb2f81fa03d91d14d2fdc9a5 (diff) | |
Merge pull request #323 from LabNConsulting/working/master/patch/install1
Fix a couple of centos related install issues
| -rw-r--r-- | doc/Building_FRR_on_CentOS6.md | 2 | ||||
| -rw-r--r-- | doc/Building_FRR_on_CentOS7.md | 2 | ||||
| -rw-r--r-- | redhat/frr.spec.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/Building_FRR_on_CentOS6.md b/doc/Building_FRR_on_CentOS6.md index 3829962d4a..b18e53470b 100644 --- a/doc/Building_FRR_on_CentOS6.md +++ b/doc/Building_FRR_on_CentOS6.md @@ -18,7 +18,7 @@ Add packages: sudo yum install git autoconf automake libtool make gawk readline-devel \ texinfo net-snmp-devel groff pkgconfig json-c-devel pam-devel \ - flex c-ares-devel epel-release + flex c-ares-devel epel-release rpm-build libcap-devel texi2html Install newer version of bison (CentOS 6 package source is too old) from CentOS 7 diff --git a/doc/Building_FRR_on_CentOS7.md b/doc/Building_FRR_on_CentOS7.md index 41c88b5593..e24c73a175 100644 --- a/doc/Building_FRR_on_CentOS7.md +++ b/doc/Building_FRR_on_CentOS7.md @@ -15,7 +15,7 @@ Add packages: sudo yum install git autoconf automake libtool make gawk readline-devel \ texinfo net-snmp-devel groff pkgconfig json-c-devel pam-devel \ - bison flex pytest c-ares-devel python-devel + bison flex pytest c-ares-devel python-devel rpm-build To build from git (in difference to building from distribution tar.gz as created by `make dist`), the python development libraries are needed. (Make sure you've installed EPEL libraries as shown above for this to work) diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index bb23931b13..b86d115507 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -73,7 +73,7 @@ %{!?frr_gid: %global frr_gid 92 } %{!?vty_gid: %global vty_gid 85 } -%define daemon_list zebra ripd ospfd bgpd isisd pimd ripngd ospfd6d +%define daemon_list zebra ripd ospfd bgpd isisd pimd ripngd ospf6d %if %{with_ldpd} %define daemon_ldpd ldpd |