redhat: ship IRDP module

No point in configuring IRDP (it's always available on Linux), just ship
the module and let the user decide whether to enable it by way of module
loading.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2017-08-15 14:19:16 +02:00
parent 8dc1f7fc88
commit 0ed9196b0c

View File

@ -13,7 +13,6 @@
%{!?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_nhrpd: %global with_nhrpd 1 }
@ -221,6 +220,7 @@ developing OSPF-API and frr applications.
--libexecdir=%{_libexecdir} \
--localstatedir=%{_localstatedir} \
--disable-werror \
--enable-irdp \
%if !%{with_shared}
--disable-shared \
%endif
@ -238,11 +238,6 @@ developing OSPF-API and frr applications.
%else
--enable-ospfapi=no \
%endif
%if %{with_irdp}
--enable-irdp=yes \
%else
--enable-irdp=no \
%endif
%if %{with_rtadv}
--enable-rtadv=yes \
%else
@ -325,6 +320,9 @@ rm -rf %{buildroot}/usr/share/info/dir
# Remove debian init script if it was installed
rm -f %{buildroot}%{_sbindir}/frr
# kill bogus libtool files for modules
rm -f %{buildroot}%{_libdir}/frr/modules/*.la
# install /etc sources
%if "%{initsystem}" == "systemd"
mkdir -p %{buildroot}%{_unitdir}
@ -554,6 +552,7 @@ rm -rf %{buildroot}
%{_libdir}/lib*.so.0
%attr(755,root,root) %{_libdir}/lib*.so.0.*
%endif
%attr(755,root,root) %{_libdir}/frr/modules/zebra_irdp.so
%{_bindir}/*
%config(noreplace) /etc/frr/[!v]*.conf*
%config(noreplace) %attr(750,%frr_user,%frr_user) /etc/frr/daemons