From 45a39399d7b6a5fc6bed721e58871d2a30cfe91a Mon Sep 17 00:00:00 2001 From: Lou Berger Date: Mon, 3 Apr 2017 17:30:31 -0400 Subject: [PATCH 1/2] doc: fix some omissions in centos instructions Signed-off-by: Lou Berger --- doc/Building_FRR_on_CentOS6.md | 2 +- doc/Building_FRR_on_CentOS7.md | 2 +- 2 files changed, 2 insertions(+), 2 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) From 208bf70046b20489eb2f81fa03d91d14d2fdc9a5 Mon Sep 17 00:00:00 2001 From: Lou Berger Date: Mon, 3 Apr 2017 17:32:03 -0400 Subject: [PATCH 2/2] redhat/frr.spec.in: fix typo Signed-off-by: Lou Berger --- redhat/frr.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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