From 209bcc649ad0f74534a4d288849180c9119380a1 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 6 Apr 2022 09:53:10 +0200 Subject: [PATCH 1/2] keepalived: add missing CONFIG_ prefix to PKG_CONFIG_DEPENDS elements Signed-off-by: Florian Eckert --- net/keepalived/Makefile | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/net/keepalived/Makefile b/net/keepalived/Makefile index 2e288373f..ce1afd233 100644 --- a/net/keepalived/Makefile +++ b/net/keepalived/Makefile @@ -21,21 +21,21 @@ PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Ben Kelly \ Florian Eckert -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_IPTABLES&&IPV6):libip6tc \ +KEEPALIVED_IPTABLES:libxtables \ +KEEPALIVED_IPTABLES:libipset \ +(KEEPALIVED_SNMP_VRRP||KEEPALIVED_SNMP_CHECKER||KEEPALIVED_SNMP_RFC2||KEEPALIVED_SNMP_RFC3):libnetsnmp \ From eed4277d5cc923c41ae2c4e182fc7449bb44b090 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 6 Apr 2022 11:39:28 +0200 Subject: [PATCH 2/2] keepalived: fix libip6tc dependency Signed-off-by: Florian Eckert --- net/keepalived/Config.in | 10 ++++++++++ net/keepalived/Makefile | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/net/keepalived/Config.in b/net/keepalived/Config.in index 862398db1..33321aa87 100644 --- a/net/keepalived/Config.in +++ b/net/keepalived/Config.in @@ -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 diff --git a/net/keepalived/Makefile b/net/keepalived/Makefile index ce1afd233..3665df834 100644 --- a/net/keepalived/Makefile +++ b/net/keepalived/Makefile @@ -64,7 +64,7 @@ define Package/keepalived +KEEPALIVED_VRRP:libnfnetlink \ +KEEPALIVED_SHA1:libopenssl \ +KEEPALIVED_IPTABLES:libip4tc \ - +(KEEPALIVED_IPTABLES&&IPV6):libip6tc \ + +KEEPALIVED_IP6TABLES:libip6tc \ +KEEPALIVED_IPTABLES:libxtables \ +KEEPALIVED_IPTABLES:libipset \ +(KEEPALIVED_SNMP_VRRP||KEEPALIVED_SNMP_CHECKER||KEEPALIVED_SNMP_RFC2||KEEPALIVED_SNMP_RFC3):libnetsnmp \