mirror of
https://git.openwrt.org/feed/packages.git
synced 2024-06-16 20:33:58 +02:00
Merge pull request #18263 from TDT-AG/pr/20220406-keepalived
keepalived: fix makfile
This commit is contained in:
commit
fa95654b28
|
@ -66,11 +66,21 @@ config KEEPALIVED_IPTABLES
|
|||
depends on KEEPALIVED_VRRP
|
||||
bool
|
||||
default y
|
||||
select KEEPALIVED_IP6TABLES
|
||||
prompt "Enable iptables for VIP filtering"
|
||||
help
|
||||
Builds support for using iptables/ipsets for filtering packets
|
||||
to VIPs
|
||||
|
||||
config KEEPALIVED_IP6TABLES
|
||||
depends on KEEPALIVED_VRRP && KEEPALIVED_IPTABLES && IPV6
|
||||
bool
|
||||
default y
|
||||
prompt "Enable ip6tables for VIP filtering"
|
||||
help
|
||||
Builds support for using ip6tables/ipsets for filtering packets
|
||||
to VIPs
|
||||
|
||||
config KEEPALIVED_NFTABLES
|
||||
depends on KEEPALIVED_VRRP
|
||||
bool
|
||||
|
|
|
@ -21,21 +21,21 @@ PKG_LICENSE_FILES:=COPYING
|
|||
PKG_MAINTAINER:=Ben Kelly <ben@benjii.net> \
|
||||
Florian Eckert <fe@dev.tdt.de>
|
||||
|
||||
PKG_CONFIG_DEPENDS += \
|
||||
KEEPALIVED_NFTABLES \
|
||||
KEEPALIVED_VRRP \
|
||||
KEEPALIVED_LVS \
|
||||
KEEPALIVED_IPTABLES \
|
||||
KEEPALIVED_BFD \
|
||||
KEEPALIVED_SNMP_VRRP \
|
||||
KEEPALIVED_SNMP_CHECKER \
|
||||
KEEPALIVED_SNMP_RFC2 \
|
||||
KEEPALIVED_SNMP_RFC3 \
|
||||
KEEPALIVED_SNMP_REPLY_V3_FOR_V2 \
|
||||
KEEPALIVED_DBUS \
|
||||
KEEPALIVED_JSON \
|
||||
KEEPALIVED_ROUTES \
|
||||
IPV6
|
||||
PKG_CONFIG_DEPENDS:= \
|
||||
CONFIG_KEEPALIVED_NFTABLES \
|
||||
CONFIG_KEEPALIVED_VRRP \
|
||||
CONFIG_KEEPALIVED_LVS \
|
||||
CONFIG_KEEPALIVED_IPTABLES \
|
||||
CONFIG_KEEPALIVED_BFD \
|
||||
CONFIG_KEEPALIVED_SNMP_VRRP \
|
||||
CONFIG_KEEPALIVED_SNMP_CHECKER \
|
||||
CONFIG_KEEPALIVED_SNMP_RFC2 \
|
||||
CONFIG_KEEPALIVED_SNMP_RFC3 \
|
||||
CONFIG_KEEPALIVED_SNMP_REPLY_V3_FOR_V2 \
|
||||
CONFIG_KEEPALIVED_DBUS \
|
||||
CONFIG_KEEPALIVED_JSON \
|
||||
CONFIG_KEEPALIVED_ROUTES \
|
||||
CONFIG_IPV6
|
||||
|
||||
PKG_INSTALL:=1
|
||||
|
||||
|
@ -46,11 +46,6 @@ define Package/keepalived/config
|
|||
source "$(SOURCE)/Config.in"
|
||||
endef
|
||||
|
||||
# specifying +(IPV6&&KEEPALIVED_IPTABLES) in the DEPENDS definition doesn't work
|
||||
ifeq ($(CONFIG_KEEPALIVED_IPTABLES)$(CONFIG_IPV6),yy)
|
||||
KEEPALIVED_DEPENDS_LIBIP6TC=+libip6tc
|
||||
endif
|
||||
|
||||
# The +kmod-nf-ipvs line should be +KEEPALIVED_LVS:kmod-nf-ipvs,
|
||||
# but make menuconfig then reports :error: recursive dependency detected!
|
||||
# !!FIXME DEPENDS:= +KEEPALIVED_LVS:kmod-nf-ipvs
|
||||
|
@ -69,7 +64,7 @@ define Package/keepalived
|
|||
+KEEPALIVED_VRRP:libnfnetlink \
|
||||
+KEEPALIVED_SHA1:libopenssl \
|
||||
+KEEPALIVED_IPTABLES:libip4tc \
|
||||
$(KEEPALIVED_DEPENDS_LIBIP6TC) \
|
||||
+KEEPALIVED_IP6TABLES:libip6tc \
|
||||
+KEEPALIVED_IPTABLES:libxtables \
|
||||
+KEEPALIVED_IPTABLES:libipset \
|
||||
+(KEEPALIVED_SNMP_VRRP||KEEPALIVED_SNMP_CHECKER||KEEPALIVED_SNMP_RFC2||KEEPALIVED_SNMP_RFC3):libnetsnmp \
|
||||
|
|
Loading…
Reference in New Issue
Block a user