Skip to content

Commit

Permalink
doc, debianpkg: Cleanup tcp-zebra configure options
Browse files Browse the repository at this point in the history
Since we removed --enable-tcp-zebra cleanup the last
remaining vestiges of that code from the system.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
  • Loading branch information
donaldsharp committed Aug 20, 2018
1 parent a55a8b4 commit 1491ad1
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 25 deletions.
8 changes: 0 additions & 8 deletions debianpkg/backports/ubuntu12.04/debian/rules
Expand Up @@ -10,7 +10,6 @@
WANT_LDP ?= 1 WANT_LDP ?= 1
WANT_PIM ?= 1 WANT_PIM ?= 1
WANT_OSPFAPI ?= 1 WANT_OSPFAPI ?= 1
WANT_TCP_ZEBRA ?= 0
WANT_BGP_VNC ?= 1 WANT_BGP_VNC ?= 1
WANT_CUMULUS_MODE ?= 0 WANT_CUMULUS_MODE ?= 0
WANT_MULTIPATH ?= 1 WANT_MULTIPATH ?= 1
Expand Down Expand Up @@ -65,12 +64,6 @@ else
USE_OSPFAPI=--enable-ospfapi=no USE_OSPFAPI=--enable-ospfapi=no
endif endif


ifeq ($(WANT_TCP_ZEBRA),1)
USE_TCP_ZEBRA=--enable-tcp-zebra
else
USE_TCP_ZEBRA=--disable-tcp-zebra
endif

ifeq ($(WANT_BGP_VNC), 1) ifeq ($(WANT_BGP_VNC), 1)
USE_BGP_VNC=--enable-bgp-vnc=yes USE_BGP_VNC=--enable-bgp-vnc=yes
else else
Expand Down Expand Up @@ -123,7 +116,6 @@ override_dh_auto_configure:
$(USE_OSPFAPI) \ $(USE_OSPFAPI) \
$(USE_MULTIPATH) \ $(USE_MULTIPATH) \
$(USE_LDP) \ $(USE_LDP) \
$(USE_TCP_ZEBRA) \
--enable-fpm \ --enable-fpm \
$(USE_FRR_USER) $(USE_FRR_GROUP) \ $(USE_FRR_USER) $(USE_FRR_GROUP) \
$(USE_FRR_VTY_GROUP) \ $(USE_FRR_VTY_GROUP) \
Expand Down
8 changes: 0 additions & 8 deletions debianpkg/backports/ubuntu14.04/debian/rules
Expand Up @@ -10,7 +10,6 @@
WANT_LDP ?= 1 WANT_LDP ?= 1
WANT_PIM ?= 1 WANT_PIM ?= 1
WANT_OSPFAPI ?= 1 WANT_OSPFAPI ?= 1
WANT_TCP_ZEBRA ?= 0
WANT_BGP_VNC ?= 1 WANT_BGP_VNC ?= 1
WANT_CUMULUS_MODE ?= 0 WANT_CUMULUS_MODE ?= 0
WANT_MULTIPATH ?= 1 WANT_MULTIPATH ?= 1
Expand Down Expand Up @@ -75,12 +74,6 @@ else
USE_OSPFAPI=--enable-ospfapi=no USE_OSPFAPI=--enable-ospfapi=no
endif endif


ifeq ($(WANT_TCP_ZEBRA),1)
USE_TCP_ZEBRA=--enable-tcp-zebra
else
USE_TCP_ZEBRA=--disable-tcp-zebra
endif

ifeq ($(WANT_BGP_VNC), 1) ifeq ($(WANT_BGP_VNC), 1)
USE_BGP_VNC=--enable-bgp-vnc=yes USE_BGP_VNC=--enable-bgp-vnc=yes
else else
Expand Down Expand Up @@ -152,7 +145,6 @@ override_dh_auto_configure:
$(USE_OSPFAPI) \ $(USE_OSPFAPI) \
$(USE_MULTIPATH) \ $(USE_MULTIPATH) \
$(USE_LDP) \ $(USE_LDP) \
$(USE_TCP_ZEBRA) \
--enable-fpm \ --enable-fpm \
$(USE_FRR_USER) $(USE_FRR_GROUP) \ $(USE_FRR_USER) $(USE_FRR_GROUP) \
$(USE_FRR_VTY_GROUP) \ $(USE_FRR_VTY_GROUP) \
Expand Down
8 changes: 0 additions & 8 deletions debianpkg/rules
Expand Up @@ -10,7 +10,6 @@
WANT_LDP ?= 1 WANT_LDP ?= 1
WANT_PIM ?= 1 WANT_PIM ?= 1
WANT_OSPFAPI ?= 1 WANT_OSPFAPI ?= 1
WANT_TCP_ZEBRA ?= 0
WANT_BGP_VNC ?= 1 WANT_BGP_VNC ?= 1
WANT_CUMULUS_MODE ?= 0 WANT_CUMULUS_MODE ?= 0
WANT_MULTIPATH ?= 1 WANT_MULTIPATH ?= 1
Expand Down Expand Up @@ -75,12 +74,6 @@ else
USE_OSPFAPI=--enable-ospfapi=no USE_OSPFAPI=--enable-ospfapi=no
endif endif


ifeq ($(WANT_TCP_ZEBRA),1)
USE_TCP_ZEBRA=--enable-tcp-zebra
else
USE_TCP_ZEBRA=--disable-tcp-zebra
endif

ifeq ($(WANT_BGP_VNC), 1) ifeq ($(WANT_BGP_VNC), 1)
USE_BGP_VNC=--enable-bgp-vnc=yes USE_BGP_VNC=--enable-bgp-vnc=yes
else else
Expand Down Expand Up @@ -152,7 +145,6 @@ override_dh_auto_configure:
$(USE_OSPFAPI) \ $(USE_OSPFAPI) \
$(USE_MULTIPATH) \ $(USE_MULTIPATH) \
$(USE_LDP) \ $(USE_LDP) \
$(USE_TCP_ZEBRA) \
--enable-fpm \ --enable-fpm \
$(USE_FRR_USER) $(USE_FRR_GROUP) \ $(USE_FRR_USER) $(USE_FRR_GROUP) \
$(USE_FRR_VTY_GROUP) \ $(USE_FRR_VTY_GROUP) \
Expand Down
2 changes: 1 addition & 1 deletion doc/manpages/common-options.rst
Expand Up @@ -126,7 +126,7 @@ These following options control the daemon's VTY (interactive command line) inte
staticd 2616 staticd 2616
bfdd 2617 bfdd 2617


Port 2607 is used for ospfd's Opaque LSA API, while port 2600 is used for the (insecure) TCP-ZEBRA interface. Port 2607 is used for ospfd's Opaque LSA API.


.. option:: --vty_socket vty-path .. option:: --vty_socket vty-path


Expand Down

0 comments on commit 1491ad1

Please sign in to comment.