diff options
Diffstat (limited to 'redhat')
| -rw-r--r-- | redhat/frr.spec.in | 75 |
1 files changed, 49 insertions, 26 deletions
diff --git a/redhat/frr.spec.in b/redhat/frr.spec.in index 41023dc35..d7cb517ea 100644 --- a/redhat/frr.spec.in +++ b/redhat/frr.spec.in @@ -10,29 +10,33 @@ #################### FRRouting (FRR) configure options ##################### # with-feature options -%{!?with_tcp_zebra: %global with_tcp_zebra 0 } -%{!?with_pam: %global with_pam 0 } -%{!?with_ospfclient: %global with_ospfclient 1 } -%{!?with_ospfapi: %global with_ospfapi 1 } -%{!?with_irdp: %global with_irdp 1 } -%{!?with_rtadv: %global with_rtadv 1 } -%{!?with_ldpd: %global with_ldpd 1 } -%{!?with_shared: %global with_shared 1 } -%{!?with_multipath: %global with_multipath 256 } -%{!?frr_user: %global frr_user frr } -%{!?vty_group: %global vty_group frrvty } -%{!?with_fpm: %global with_fpm 0 } -%{!?with_watchfrr: %global with_watchfrr 1 } -%{!?with_bgp_vnc: %global with_bgp_vnc 0 } -%{!?with_pimd: %global with_pimd 1 } +<<<<<<< HEAD +%{!?with_tcp_zebra: %global with_tcp_zebra 0 } +%{!?with_pam: %global with_pam 0 } +%{!?with_ospfclient: %global with_ospfclient 1 } +%{!?with_ospfapi: %global with_ospfapi 1 } +%{!?with_irdp: %global with_irdp 1 } +%{!?with_rtadv: %global with_rtadv 1 } +%{!?with_mpls: %global with_mpls 1 } +%{!?with_ldpd: %global with_ldpd 1 } +%{!?with_nhrpd: %global with_nhrpd 1 } +%{!?with_shared: %global with_shared 1 } +%{!?with_multipath: %global with_multipath 256 } +%{!?frr_user: %global frr_user frr } +%{!?vty_group: %global vty_group frrvty } +%{!?with_fpm: %global with_fpm 0 } +%{!?with_watchfrr: %global with_watchfrr 1 } +%{!?with_bgp_vnc: %global with_bgp_vnc 0 } +%{!?with_pimd: %global with_pimd 1 } # path defines -%define _sysconfdir /etc/frr -%define _sbindir /usr/lib/frr -%define zeb_src %{_builddir}/%{name}-%{frrversion} -%define zeb_rh_src %{zeb_src}/redhat -%define zeb_docs %{zeb_src}/doc -%define frr_tools %{zeb_src}/tools +%define _sysconfdir /etc/frr +%define _sbindir /usr/lib/frr +%define zeb_src %{_builddir}/%{name}-%{frrversion} +%define zeb_rh_src %{zeb_src}/redhat +%define zeb_docs %{zeb_src}/doc +%define frr_tools %{zeb_src}/tools +%define frr_tools_etc %{frr_tools}/etc # defines for configure %define _localstatedir /var/run/frr @@ -80,7 +84,7 @@ %{!?frr_gid: %global frr_gid 92 } %{!?vty_gid: %global vty_gid 85 } -%define daemon_list zebra ripd ospfd bgpd isisd ripngd ospf6d +%define daemon_list zebra ripd ospfd bgpd isisd pimd ripngd ospf6d %if %{with_ldpd} %define daemon_ldpd ldpd @@ -94,13 +98,19 @@ %define daemon_pimd "" %endif +%if %{with_nhrpd} +%define daemon_nhrpd nhrpd +%else +%define daemon_nhrpd "" +%endif + %if %{with_watchfrr} %define daemon_watchfrr watchfrr %else %define daemon_watchfrr "" %endif -%define all_daemons %{daemon_list} %{daemon_ldpd} %{daemon_pimd} %{daemon_watchfrr} +%define all_daemons %{daemon_list} %{daemon_ldpd} %{daemon_nhrpd} %{daemon_watchfrr} # allow build dir to be kept %{!?keep_build: %global keep_build 0 } @@ -145,8 +155,8 @@ FRRouting is a free software that manages TCP/IP based routing 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 -and LDP +FRRouting supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP +and NHRP. FRRouting is a fork of Quagga. @@ -237,6 +247,11 @@ developing OSPF-API and frr applications. %else --disable-pimd \ %endif +%if %{with_nhrpd} + --enable-nhrpd \ +%else + --disable-nhrpd \ +%endif %if %{with_pam} --with-libpam \ %endif @@ -303,7 +318,9 @@ install %{zeb_rh_src}/frr.init \ %{buildroot}/etc/rc.d/init.d/frr %endif -install %{zeb_rh_src}/daemons %{buildroot}/etc/frr +install %{frr_tools_dir}/frr/daemons.conf %{buildroot}/etc/frr +install %{frr_tools_dir}/frr/daemons %{buildroot}/etc/frr +install -m644 %{frr_tools_dir}/default/frr %{buildroot}/etc/default install -m644 %{zeb_rh_src}/frr.pam \ %{buildroot}/etc/pam.d/frr install -m644 %{zeb_rh_src}/frr.logrotate \ @@ -358,6 +375,9 @@ zebra_spec_add_service ospf6d 2606/tcp "OSPF6d vty" zebra_spec_add_service ospfapi 2607/tcp "OSPF-API" %endif zebra_spec_add_service isisd 2608/tcp "ISISd vty" +%if %{with_nhrpd} +zebra_spec_add_service nhrpd 2610/tcp "NHRPd vty" +%endif %if %{with_pimd} zebra_spec_add_service pimd 2611/tcp "PIMd vty" %endif @@ -496,6 +516,9 @@ rm -rf %{buildroot} %if %{with_ldpd} %{_sbindir}/ldpd %endif +%if %{with_nhrpd} +%{_sbindir}/nhrpd +%endif %if %{with_shared} %{_libdir}/lib*.so %{_libdir}/lib*.so.0 |