From 3fbe10e598dbddb2da2d503de171716de234df1e Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 6 Apr 2022 09:53:10 +0200 Subject: [PATCH] keepalived: add missing CONFIG_ prefix to PKG_CONFIG_DEPENDS elements Signed-off-by: Florian Eckert Rebase commit: nftables is not available (cherry picked from commit 209bcc649ad0f74534a4d288849180c9119380a1) --- net/keepalived/Makefile | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/net/keepalived/Makefile b/net/keepalived/Makefile index 5aa0241e5f..b0a3c53253 100644 --- a/net/keepalived/Makefile +++ b/net/keepalived/Makefile @@ -21,20 +21,20 @@ PKG_LICENSE_FILES:=COPYING PKG_MAINTAINER:=Ben Kelly \ Florian Eckert -PKG_CONFIG_DEPENDS += \ - 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_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 @@ -45,11 +45,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 @@ -66,7 +61,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 \ -- 2.30.2