* [Buildroot] [PATCH 1/2] keepalived: fix libnl optional dependnecy
@ 2017-03-20 20:52 Baruch Siach
2017-03-20 20:52 ` [Buildroot] [PATCH 2/2] keepalived: bump to version 1.3.5 Baruch Siach
2017-03-20 20:56 ` [Buildroot] [PATCH 1/2] keepalived: fix libnl optional dependnecy Thomas Petazzoni
0 siblings, 2 replies; 6+ messages in thread
From: Baruch Siach @ 2017-03-20 20:52 UTC (permalink / raw)
To: buildroot
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 <apalos@gmail.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
v2: Drop the libnfnetlink select; update commit log (Thomas P)
---
package/keepalived/keepalived.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk
index 97a4daa8b670..95757ff68130 100644
--- a/package/keepalived/keepalived.mk
+++ b/package/keepalived/keepalived.mk
@@ -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)
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] keepalived: bump to version 1.3.5
2017-03-20 20:52 [Buildroot] [PATCH 1/2] keepalived: fix libnl optional dependnecy Baruch Siach
@ 2017-03-20 20:52 ` Baruch Siach
2017-03-20 20:56 ` [Buildroot] [PATCH 1/2] keepalived: fix libnl optional dependnecy Thomas Petazzoni
1 sibling, 0 replies; 6+ messages in thread
From: Baruch Siach @ 2017-03-20 20:52 UTC (permalink / raw)
To: buildroot
The configure script now supports --{enable,disable}-libnl, use them.
Cc: Ilias Apalodimas <apalos@gmail.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
package/keepalived/keepalived.hash | 5 +----
package/keepalived/keepalived.mk | 7 ++++---
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/package/keepalived/keepalived.hash b/package/keepalived/keepalived.hash
index 543e60ad5616..5d33c5be006b 100644
--- a/package/keepalived/keepalived.hash
+++ b/package/keepalived/keepalived.hash
@@ -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
diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk
index 95757ff68130..35e666af1cc9 100644
--- a/package/keepalived/keepalived.mk
+++ b/package/keepalived/keepalived.mk
@@ -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)
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH 1/2] keepalived: fix libnl optional dependnecy
2017-03-20 20:52 [Buildroot] [PATCH 1/2] keepalived: fix libnl optional dependnecy Baruch Siach
2017-03-20 20:52 ` [Buildroot] [PATCH 2/2] keepalived: bump to version 1.3.5 Baruch Siach
@ 2017-03-20 20:56 ` Thomas Petazzoni
1 sibling, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2017-03-20 20:56 UTC (permalink / raw)
To: buildroot
Hello,
On Mon, 20 Mar 2017 22:52:41 +0200, Baruch Siach wrote:
> 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 <apalos@gmail.com>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
> 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
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] keepalived: fix libnl optional dependnecy
@ 2017-03-20 19:57 Baruch Siach
2017-03-20 20:15 ` Thomas Petazzoni
0 siblings, 1 reply; 6+ messages in thread
From: Baruch Siach @ 2017-03-20 19:57 UTC (permalink / raw)
To: buildroot
Correct two issues:
* List libnl as dependency when it is enabled
* Select libnfnetlink when libnl is selected since configure.ac requires
both
Cc: Ilias Apalodimas <apalos@gmail.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
package/keepalived/Config.in | 1 +
package/keepalived/keepalived.mk | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/keepalived/Config.in b/package/keepalived/Config.in
index efa745ad9ee6..4e97514290b7 100644
--- a/package/keepalived/Config.in
+++ b/package/keepalived/Config.in
@@ -4,6 +4,7 @@ config BR2_PACKAGE_KEEPALIVED
depends on !BR2_STATIC_LIBS # uses libdl
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_POPT
+ select BR2_PACKAGE_LIBNFNETLINK if BR2_PACKAGE_LIBNL
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 97a4daa8b670..95757ff68130 100644
--- a/package/keepalived/keepalived.mk
+++ b/package/keepalived/keepalived.mk
@@ -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)
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH 1/2] keepalived: fix libnl optional dependnecy
2017-03-20 19:57 Baruch Siach
@ 2017-03-20 20:15 ` Thomas Petazzoni
2017-03-20 20:39 ` Baruch Siach
0 siblings, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2017-03-20 20:15 UTC (permalink / raw)
To: buildroot
Hello,
On Mon, 20 Mar 2017 21:57:25 +0200, Baruch Siach wrote:
> + select BR2_PACKAGE_LIBNFNETLINK if BR2_PACKAGE_LIBNL
We generally don't do this, and only do the "double" condition that you
have below.
But if you prefer this "select", then the double condition is no longer
needed.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] keepalived: fix libnl optional dependnecy
2017-03-20 20:15 ` Thomas Petazzoni
@ 2017-03-20 20:39 ` Baruch Siach
0 siblings, 0 replies; 6+ messages in thread
From: Baruch Siach @ 2017-03-20 20:39 UTC (permalink / raw)
To: buildroot
Hi Thomas,
On Mon, Mar 20, 2017 at 09:15:58PM +0100, Thomas Petazzoni wrote:
> On Mon, 20 Mar 2017 21:57:25 +0200, Baruch Siach wrote:
>
> > + select BR2_PACKAGE_LIBNFNETLINK if BR2_PACKAGE_LIBNL
>
> We generally don't do this, and only do the "double" condition that you
> have below.
OK. I'll drop this select.
> But if you prefer this "select", then the double condition is no longer
> needed.
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-03-20 20:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-20 20:52 [Buildroot] [PATCH 1/2] keepalived: fix libnl optional dependnecy Baruch Siach
2017-03-20 20:52 ` [Buildroot] [PATCH 2/2] keepalived: bump to version 1.3.5 Baruch Siach
2017-03-20 20:56 ` [Buildroot] [PATCH 1/2] keepalived: fix libnl optional dependnecy Thomas Petazzoni
-- strict thread matches above, loose matches on Subject: below --
2017-03-20 19:57 Baruch Siach
2017-03-20 20:15 ` Thomas Petazzoni
2017-03-20 20:39 ` Baruch Siach
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox