[Buildroot] [PATCH/next 1/3] keepalived: remove popt dependency

[Buildroot] [PATCH/next 1/3] keepalived: remove popt dependency

[Fabrice Fontaine]

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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/keepalived/Config.in     | 1 -
 package/keepalived/keepalived.mk | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/keepalived/Config.in b/package/keepalived/Config.in
index 0140e62ae2..c71821545c 100644
--- a/package/keepalived/Config.in
+++ b/package/keepalived/Config.in
@@ -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
diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk
index e8a280a19c..8756811e04 100644
--- a/package/keepalived/keepalived.mk
+++ b/package/keepalived/keepalived.mk
@@ -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
-- 
2.17.1

[Buildroot] [PATCH/next 2/3] keepalive: add optional json-c dependency

[Fabrice Fontaine]

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/keepalived/keepalived.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk
index 8756811e04..fa8b2e4112 100644
--- a/package/keepalived/keepalived.mk
+++ b/package/keepalived/keepalived.mk
@@ -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
-- 
2.17.1

[Buildroot] [PATCH/next 3/3] keepalived: add libglib2 optional dependency

[Fabrice Fontaine]

gio from libglib2 is used for dbus support

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/keepalived/keepalived.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk
index fa8b2e4112..ed80a79f8a 100644
--- a/package/keepalived/keepalived.mk
+++ b/package/keepalived/keepalived.mk
@@ -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
-- 
2.17.1

[Buildroot] [PATCH/next 1/3] keepalived: remove popt dependency

[Thomas Petazzoni]

Hello,

On Mon, 19 Nov 2018 19:06:48 +0100, Fabrice Fontaine wrote:
> popt is not needed since version 1.3.1 and:
> https://github.com/acassen/keepalived/commit/3452517c4f2b69badabf19fc06cc56db49d37603
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/keepalived/Config.in     | 1 -
>  package/keepalived/keepalived.mk | 2 +-
>  2 files changed, 1 insertion(+), 2 deletions(-)

Series applied to next. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com