Skip to contentSkip to conversation

keepalived: remove popt dependency

PATCH New Fabrice Fontaine 2 participants 4 messages Nov 19, 2018

lore
Share & tools
lore

Fabrice Fontaine

author
#0 lore raw

PATCH 1/3 keepalived: remove popt dependency

popt is not needed since version 1.3.1 and:
https://github.com/acassen/keepalived/commit/3452517c4f2b69badabf19fc06cc56db49d37603

Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/keepalived/Config.in     | 1 -
 package/keepalived/keepalived.mk | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
package/keepalived/Config.in +0 -1
index 0140e62ae2..c71821545c 100644
@@ -4,7 +4,6 @@ config BR2_PACKAGE_KEEPALIVED
 	depends on !BR2_STATIC_LIBS # uses libdl
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
 	select BR2_PACKAGE_OPENSSL
-	select BR2_PACKAGE_POPT
 	help
 	  The main goal of the keepalived project is to add a strong &
 	  robust keepalive facility to the Linux Virtual Server
package/keepalived/keepalived.mk +1 -1
index e8a280a19c..8756811e04 100644
@@ -6,7 +6,7 @@
 
 KEEPALIVED_VERSION = 1.4.2
 KEEPALIVED_SITE = http://www.keepalived.org/software
-KEEPALIVED_DEPENDENCIES = host-pkgconf openssl popt
+KEEPALIVED_DEPENDENCIES = host-pkgconf openssl
 KEEPALIVED_LICENSE = GPL-2.0+
 KEEPALIVED_LICENSE_FILES = COPYING
 # 0001-configure.ac-do-not-force-PIE.patch
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/3 keepalive: add optional json-c dependency

Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/keepalived/keepalived.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/keepalived/keepalived.mk +7 -0
index 8756811e04..fa8b2e4112 100644
@@ -13,6 +13,13 @@ KEEPALIVED_LICENSE_FILES = COPYING
 KEEPALIVED_AUTORECONF = YES
 KEEPALIVED_CONF_OPTS += --disable-dbus
 
+ifeq ($(BR2_PACKAGE_JSON_C),y)
+KEEPALIVED_DEPENDENCIES += json-c
+KEEPALIVED_CONF_OPTS += --enable-json
+else
+KEEPALIVED_CONF_OPTS += --disable-json
+endif
+
 ifeq ($(BR2_PACKAGE_LIBNL)$(BR2_PACKAGE_LIBNFNETLINK),yy)
 KEEPALIVED_DEPENDENCIES += libnl libnfnetlink
 KEEPALIVED_CONF_OPTS += --enable-libnl
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH 3/3 keepalived: add libglib2 optional dependency

In reply to Fabrice Fontaine

gio from libglib2 is used for dbus support

Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/keepalived/keepalived.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/keepalived/keepalived.mk +7 -1
index fa8b2e4112..ed80a79f8a 100644
@@ -11,7 +11,6 @@ KEEPALIVED_LICENSE = GPL-2.0+
 KEEPALIVED_LICENSE_FILES = COPYING
 # 0001-configure.ac-do-not-force-PIE.patch
 KEEPALIVED_AUTORECONF = YES
-KEEPALIVED_CONF_OPTS += --disable-dbus
 
 ifeq ($(BR2_PACKAGE_JSON_C),y)
 KEEPALIVED_DEPENDENCIES += json-c

@@ -20,6 +19,13 @@ else
 KEEPALIVED_CONF_OPTS += --disable-json
 endif
 
+ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
+KEEPALIVED_DEPENDENCIES += libglib2
+KEEPALIVED_CONF_OPTS += --enable-dbus
+else
+KEEPALIVED_CONF_OPTS += --disable-dbus
+endif
+
 ifeq ($(BR2_PACKAGE_LIBNL)$(BR2_PACKAGE_LIBNFNETLINK),yy)
 KEEPALIVED_DEPENDENCIES += libnl libnfnetlink
 KEEPALIVED_CONF_OPTS += --enable-libnl
Signature · 1 line
2.17.1
#3 lore raw

PATCH 1/3 keepalived: remove popt dependency

In reply to Fabrice Fontaine

Hello,

Quoted 8 lines · Fabrice Fontaine

popt is not needed since version 1.3.1 and:
https://github.com/acassen/keepalived/commit/3452517c4f2b69badabf19fc06cc56db49d37603

Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/keepalived/Config.in     | 1 -
 package/keepalived/keepalived.mk | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

Series applied to next. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com