Skip to contentSkip to conversation

keepalived: fix libnl optional dependnecy

PATCH New Baruch Siach 2 participants 3 messages Mar 20, 2017

lore
Share & tools
lore

Baruch Siach

author
#0 lore raw

PATCH 1/2 keepalived: fix libnl optional dependnecy

List libnl as a dependency when it is enabled. Make sure that libnfnetlink is actually enabled when listing it as a dependency.

Cc Ilias Apalodimas <[email protected]>
Signed-off-by Baruch Siach <[email protected]>

---
v2: Drop the libnfnetlink select; update commit log (Thomas P)

---
 package/keepalived/keepalived.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/keepalived/keepalived.mk +2 -2
index 97a4daa8b670..95757ff68130 100644
@@ -13,8 +13,8 @@ KEEPALIVED_CONF_OPTS += --disable-dbus
 
 KEEPALIVED_PATCH = https://github.com/acassen/keepalived/commit/5d98b7b69fcbba84fa69e5b5e9a019bfbcb76e8b.patch
 
-ifeq ($(BR2_PACKAGE_LIBNL),y)
-KEEPALIVED_DEPENDENCIES += libnfnetlink
+ifeq ($(BR2_PACKAGE_LIBNL)$(BR2_PACKAGE_LIBNFNETLINK),yy)
+KEEPALIVED_DEPENDENCIES += libnl libnfnetlink
 endif
 
 ifeq ($(BR2_PACKAGE_IPSET),y)
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH 2/2 keepalived: bump to version 1.3.5

The configure script now supports --{enable,disable}-libnl, use them.

Cc Ilias Apalodimas <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 package/keepalived/keepalived.hash | 5 +----
 package/keepalived/keepalived.mk   | 7 ++++---
 2 files changed, 5 insertions(+), 7 deletions(-)
package/keepalived/keepalived.hash +1 -4
index 543e60ad5616..5d33c5be006b 100644
@@ -1,5 +1,2 @@
-# From http://www.keepalived.org/download.html
-md5 744025d57c7f065c42fe925b0283897e	keepalived-1.3.2.tar.gz
-sha1	449f06dfce07e05c1ebd516d0545182e1416f264  keepalived-1.3.2.tar.gz
 # Locally calculated
-sha256	0f261e6810b3eced68dc9858a1f28694e4a91116035fe76c4400ec4ac208feda	5d98b7b69fcbba84fa69e5b5e9a019bfbcb76e8b.patch
+sha256	c0114d86ea4c896557beb0d9367819a423ffba772bc5d7c548dc455e6b3bd048  keepalived-1.3.5.tar.gz
package/keepalived/keepalived.mk +4 -3
index 95757ff68130..35e666af1cc9 100644
@@ -4,17 +4,18 @@
 #
 ################################################################################
 
-KEEPALIVED_VERSION = 1.3.2
+KEEPALIVED_VERSION = 1.3.5
 KEEPALIVED_SITE = http://www.keepalived.org/software
 KEEPALIVED_DEPENDENCIES = host-pkgconf openssl popt
 KEEPALIVED_LICENSE = GPLv2+
 KEEPALIVED_LICENSE_FILES = COPYING
 KEEPALIVED_CONF_OPTS += --disable-dbus
 
-KEEPALIVED_PATCH = https://github.com/acassen/keepalived/commit/5d98b7b69fcbba84fa69e5b5e9a019bfbcb76e8b.patch
-
 ifeq ($(BR2_PACKAGE_LIBNL)$(BR2_PACKAGE_LIBNFNETLINK),yy)
 KEEPALIVED_DEPENDENCIES += libnl libnfnetlink
+KEEPALIVED_CONF_OPTS += --enable-libnl
+else
+KEEPALIVED_CONF_OPTS += --disable-libnl
 endif
 
 ifeq ($(BR2_PACKAGE_IPSET),y)
Signature · 1 line
2.11.0
#2 lore raw

PATCH 1/2 keepalived: fix libnl optional dependnecy

In reply to Baruch Siach

Hello,

Quoted 10 lines · Baruch Siach

List libnl as a dependency when it is enabled. Make sure that libnfnetlink is actually enabled when listing it as a dependency.

Cc Ilias Apalodimas <[email protected]>
Signed-off-by Baruch Siach <[email protected]>

---
v2: Drop the libnfnetlink select; update commit log (Thomas P)

---
 package/keepalived/keepalived.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Thanks, both patches applied.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com