debianpkg: Always build FPM module

- FPM is a module since 3.0. Always build it and allow user choice to enable or disable it

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
This commit is contained in:
Martin Winter 2017-10-09 02:33:11 -07:00
parent 979bf74e97
commit 23b53dca77
3 changed files with 3 additions and 36 deletions

View File

@ -11,7 +11,6 @@
# export WANT_PIM=1 # export WANT_PIM=1
# export WANT_OSPFAPI=1 # export WANT_OSPFAPI=1
# export WANT_TCP_ZEBRA=0 # export WANT_TCP_ZEBRA=0
# export WANT_FPM=0
# export WANT_BGP_VNC=0 # export WANT_BGP_VNC=0
# export WANT_CUMULUS_MODE=0 # export WANT_CUMULUS_MODE=0
# export WANT_MULTIPATH=1 # export WANT_MULTIPATH=1
@ -56,16 +55,6 @@ else
USE_OSPFAPI=--enable-ospfapi=no USE_OSPFAPI=--enable-ospfapi=no
endif endif
ifeq ($(WANT_FPM), 1)
USE_FPM=---enable-fpm
ifneq ($(WANT_TCP_ZEBRA),1)
$(warning "Zebra TCP interface enabled for FPM (requirement for FPM)")
export WANT_TCP_ZEBRA=1
endif
else
USE_FPM=--disable-fpm
endif
ifeq ($(WANT_TCP_ZEBRA),1) ifeq ($(WANT_TCP_ZEBRA),1)
USE_TCP_ZEBRA=--enable-tcp-zebra USE_TCP_ZEBRA=--enable-tcp-zebra
endif endif
@ -137,7 +126,7 @@ override_dh_auto_configure:
$(USE_MULTIPATH) \ $(USE_MULTIPATH) \
$(USE_LDP) \ $(USE_LDP) \
$(USE_TCP_ZEBRA) \ $(USE_TCP_ZEBRA) \
$(USE_FPM) \ --enable-fpm \
$(USE_FRR_USER) $(USE_FRR_GROUP) \ $(USE_FRR_USER) $(USE_FRR_GROUP) \
$(USE_FRR_VTY_GROUP) \ $(USE_FRR_VTY_GROUP) \
--enable-configfile-mask=0640 \ --enable-configfile-mask=0640 \

View File

@ -11,7 +11,6 @@
# export WANT_PIM=1 # export WANT_PIM=1
# export WANT_OSPFAPI=1 # export WANT_OSPFAPI=1
# export WANT_TCP_ZEBRA=0 # export WANT_TCP_ZEBRA=0
# export WANT_FPM=0
# export WANT_BGP_VNC=0 # export WANT_BGP_VNC=0
# export WANT_CUMULUS_MODE=0 # export WANT_CUMULUS_MODE=0
# export WANT_MULTIPATH=1 # export WANT_MULTIPATH=1
@ -56,16 +55,6 @@ else
USE_OSPFAPI=--enable-ospfapi=no USE_OSPFAPI=--enable-ospfapi=no
endif endif
ifeq ($(WANT_FPM), 1)
USE_FPM=---enable-fpm
ifneq ($(WANT_TCP_ZEBRA),1)
$(warning "Zebra TCP interface enabled for FPM (requirement for FPM)")
export WANT_TCP_ZEBRA=1
endif
else
USE_FPM=--disable-fpm
endif
ifeq ($(WANT_TCP_ZEBRA),1) ifeq ($(WANT_TCP_ZEBRA),1)
USE_TCP_ZEBRA=--enable-tcp-zebra USE_TCP_ZEBRA=--enable-tcp-zebra
endif endif
@ -137,7 +126,7 @@ override_dh_auto_configure:
$(USE_MULTIPATH) \ $(USE_MULTIPATH) \
$(USE_LDP) \ $(USE_LDP) \
$(USE_TCP_ZEBRA) \ $(USE_TCP_ZEBRA) \
$(USE_FPM) \ --enable-fpm \
$(USE_FRR_USER) $(USE_FRR_GROUP) \ $(USE_FRR_USER) $(USE_FRR_GROUP) \
$(USE_FRR_VTY_GROUP) \ $(USE_FRR_VTY_GROUP) \
--enable-configfile-mask=0640 \ --enable-configfile-mask=0640 \

View File

@ -11,7 +11,6 @@
# export WANT_PIM=1 # export WANT_PIM=1
# export WANT_OSPFAPI=1 # export WANT_OSPFAPI=1
# export WANT_TCP_ZEBRA=0 # export WANT_TCP_ZEBRA=0
# export WANT_FPM=0
# export WANT_BGP_VNC=0 # export WANT_BGP_VNC=0
# export WANT_CUMULUS_MODE=0 # export WANT_CUMULUS_MODE=0
# export WANT_MULTIPATH=1 # export WANT_MULTIPATH=1
@ -56,16 +55,6 @@ else
USE_OSPFAPI=--enable-ospfapi=no USE_OSPFAPI=--enable-ospfapi=no
endif endif
ifeq ($(WANT_FPM), 1)
USE_FPM=---enable-fpm
ifneq ($(WANT_TCP_ZEBRA),1)
$(warning "Zebra TCP interface enabled for FPM (requirement for FPM)")
export WANT_TCP_ZEBRA=1
endif
else
USE_FPM=--disable-fpm
endif
ifeq ($(WANT_TCP_ZEBRA),1) ifeq ($(WANT_TCP_ZEBRA),1)
USE_TCP_ZEBRA=--enable-tcp-zebra USE_TCP_ZEBRA=--enable-tcp-zebra
endif endif
@ -137,7 +126,7 @@ override_dh_auto_configure:
$(USE_MULTIPATH) \ $(USE_MULTIPATH) \
$(USE_LDP) \ $(USE_LDP) \
$(USE_TCP_ZEBRA) \ $(USE_TCP_ZEBRA) \
$(USE_FPM) \ --enable-fpm \
$(USE_FRR_USER) $(USE_FRR_GROUP) \ $(USE_FRR_USER) $(USE_FRR_GROUP) \
$(USE_FRR_VTY_GROUP) \ $(USE_FRR_VTY_GROUP) \
--enable-configfile-mask=0640 \ --enable-configfile-mask=0640 \