redhat: PBR modifications to allow it to build properly

Add to the redhat build the PBR daemon and it's ancillary
files.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

redhat/frr.init

@@ -33,7 +33,7 @@ V_PATH=/var/run/frr
 # Local Daemon selection may be done by using /etc/frr/daemons.
 # See /usr/share/doc/frr/README.Debian.gz for further information.
 # Keep zebra first and do not list watchfrr!
-DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd pimd ldpd nhrpd eigrpd babeld"
+DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd pimd pbrd ldpd nhrpd eigrpd babeld"
 MAX_INSTANCES=5
 RELOAD_SCRIPT=/usr/lib/frr/frr-reload.py
 

redhat/frr.spec.in

@@ -26,6 +26,7 @@
 %{!?with_watchfrr:      %global  with_watchfrr      1 }
 %{!?with_bgp_vnc:       %global  with_bgp_vnc       0 }
 %{!?with_pimd:          %global  with_pimd          1 }
+%{!?with_pbrd:          %global  with_pbrd          1 }
 
 # path defines
 %define     _sysconfdir   /etc/frr
@@ -99,6 +100,12 @@
 %define     daemon_pimd ""
 %endif
 
+%if %{with_pbrd}
+%define     daemon_pbrd pbrd
+%else
+%define     daemon_pbrd ""
+%endif
+
 %if %{with_nhrpd}
 %define         daemon_nhrpd	nhrpd
 %else
@@ -123,7 +130,7 @@
 %define     daemon_watchfrr ""
 %endif
 
-%define     all_daemons %{daemon_list} %{daemon_ldpd} %{daemon_pimd} %{daemon_nhrpd} %{daemon_eigrpd} %{daemon_babeld} %{daemon_watchfrr}
+%define     all_daemons %{daemon_list} %{daemon_ldpd} %{daemon_pimd} %{daemon_nhrpd} %{daemon_eigrpd} %{daemon_babeld} %{daemon_watchfrr} %{daemon_pbrd}
 
 # allow build dir to be kept
 %{!?keep_build:         %global  keep_build         0 }
@@ -176,7 +183,7 @@ protocol. It takes multi-server and multi-thread approach to resolve
 the current complexity of the Internet.
 
 FRRouting supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP
-NHRP, Babel and EIGRP.
+NHRP, Babel, PBR and EIGRP.
 
 FRRouting is a fork of Quagga.
 
@@ -260,6 +267,11 @@ developing OSPF-API and frr applications.
 %else
     --disable-pimd \
 %endif
+%if %{with_pbrd}
+    --enable-pbrd \
+%else
+    --disable-pbrd \
+%endif
 %if %{with_nhrpd}
 	--enable-nhrpd \
 %else
@@ -405,6 +417,9 @@ zebra_spec_add_service nhrpd    2610/tcp "NHRPd vty"
 %if %{with_pimd}
 zebra_spec_add_service pimd     2611/tcp "PIMd vty"
 %endif
+%if %{with_pbrd}
+zebra_spec_add_service pbrd     2615/tcp "PBRd vty"
+%endif
 %if %{with_ldpd}
 zebra_spec_add_service ldpd     2612/tcp "LDPd vty"
 %endif
@@ -538,6 +553,9 @@ rm -rf %{buildroot}
 %if %{with_pimd}
     %{_sbindir}/pimd
 %endif
+%if %{with_pbrd}
+    %{_sbindir}/pbrd
+%endif
 %{_sbindir}/isisd
 %if %{with_ldpd}
     %{_sbindir}/ldpd