* [Buildroot] [PATCH 1/4] package/iputils: removed dependency on openssl
@ 2016-02-25 13:23 Martin Bark
2016-02-25 13:23 ` [Buildroot] [PATCH 2/4] package/iputils: add support for nettle Martin Bark
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Martin Bark @ 2016-02-25 13:23 UTC (permalink / raw)
To: buildroot
iputils does not have to be built with openssl so remove selecting
BR2_PACKAGE_OPENSSL and make the dependency optional
Signed-off-by: Martin Bark <martin@barkynet.com>
---
package/iputils/Config.in | 1 -
package/iputils/iputils.mk | 8 +++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/package/iputils/Config.in b/package/iputils/Config.in
index 40580d2..c83e414 100644
--- a/package/iputils/Config.in
+++ b/package/iputils/Config.in
@@ -1,6 +1,5 @@
config BR2_PACKAGE_IPUTILS
bool "iputils"
- select BR2_PACKAGE_OPENSSL
depends on BR2_USE_MMU # fork()
help
This package is set of small useful utilities for Linux networking.
diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk
index 6392dec..953f1f5 100644
--- a/package/iputils/iputils.mk
+++ b/package/iputils/iputils.mk
@@ -16,7 +16,6 @@ IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION))
IPUTILS_LICENSE = GPLv2+, BSD-3c, BSD-4c
# Only includes a license file for BSD
IPUTILS_LICENSE_FILES = ninfod/COPYING
-IPUTILS_DEPENDENCIES = openssl
# Build after busybox so target ends up with this package's full
# versions of the applications instead of busybox applets.
@@ -34,6 +33,13 @@ else
IPUTILS_MAKE_OPTS += USE_CAP=no
endif
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+IPUTILS_MAKE_OPTS += USE_CRYPTO=yes
+IPUTILS_DEPENDENCIES += openssl
+else
+IPUTILS_MAKE_OPTS += USE_CRYPTO=no
+endif
+
define IPUTILS_BUILD_CMDS
$(MAKE) -C $(@D) $(IPUTILS_MAKE_OPTS)
endef
--
2.5.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/4] package/iputils: add support for nettle
2016-02-25 13:23 [Buildroot] [PATCH 1/4] package/iputils: removed dependency on openssl Martin Bark
@ 2016-02-25 13:23 ` Martin Bark
2016-02-25 13:23 ` [Buildroot] [PATCH 3/4] package/iputils: add support for libgcrypt Martin Bark
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Martin Bark @ 2016-02-25 13:23 UTC (permalink / raw)
To: buildroot
Signed-off-by: Martin Bark <martin@barkynet.com>
---
package/iputils/iputils.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk
index 953f1f5..efedf1f 100644
--- a/package/iputils/iputils.mk
+++ b/package/iputils/iputils.mk
@@ -33,6 +33,13 @@ else
IPUTILS_MAKE_OPTS += USE_CAP=no
endif
+ifeq ($(BR2_PACKAGE_NETTLE),y)
+IPUTILS_MAKE_OPTS += USE_NETTLE=yes
+IPUTILS_DEPENDENCIES += nettle
+else
+IPUTILS_MAKE_OPTS += USE_NETTLE=no
+endif
+
ifeq ($(BR2_PACKAGE_OPENSSL),y)
IPUTILS_MAKE_OPTS += USE_CRYPTO=yes
IPUTILS_DEPENDENCIES += openssl
--
2.5.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 3/4] package/iputils: add support for libgcrypt
2016-02-25 13:23 [Buildroot] [PATCH 1/4] package/iputils: removed dependency on openssl Martin Bark
2016-02-25 13:23 ` [Buildroot] [PATCH 2/4] package/iputils: add support for nettle Martin Bark
@ 2016-02-25 13:23 ` Martin Bark
2016-02-25 13:23 ` [Buildroot] [PATCH 4/4] package/iptuils: bump version to 3a86a2542c6fe29413c439bebeae11ec8a57ec7c Martin Bark
2016-02-25 20:46 ` [Buildroot] [PATCH 1/4] package/iputils: removed dependency on openssl Thomas Petazzoni
3 siblings, 0 replies; 5+ messages in thread
From: Martin Bark @ 2016-02-25 13:23 UTC (permalink / raw)
To: buildroot
Signed-off-by: Martin Bark <martin@barkynet.com>
---
package/iputils/iputils.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk
index efedf1f..92e2bc9 100644
--- a/package/iputils/iputils.mk
+++ b/package/iputils/iputils.mk
@@ -33,6 +33,13 @@ else
IPUTILS_MAKE_OPTS += USE_CAP=no
endif
+ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+IPUTILS_MAKE_OPTS += USE_GCRYPT=yes
+IPUTILS_DEPENDENCIES += libgcrypt
+else
+IPUTILS_MAKE_OPTS += USE_GCRYPT=no
+endif
+
ifeq ($(BR2_PACKAGE_NETTLE),y)
IPUTILS_MAKE_OPTS += USE_NETTLE=yes
IPUTILS_DEPENDENCIES += nettle
--
2.5.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 4/4] package/iptuils: bump version to 3a86a2542c6fe29413c439bebeae11ec8a57ec7c
2016-02-25 13:23 [Buildroot] [PATCH 1/4] package/iputils: removed dependency on openssl Martin Bark
2016-02-25 13:23 ` [Buildroot] [PATCH 2/4] package/iputils: add support for nettle Martin Bark
2016-02-25 13:23 ` [Buildroot] [PATCH 3/4] package/iputils: add support for libgcrypt Martin Bark
@ 2016-02-25 13:23 ` Martin Bark
2016-02-25 20:46 ` [Buildroot] [PATCH 1/4] package/iputils: removed dependency on openssl Thomas Petazzoni
3 siblings, 0 replies; 5+ messages in thread
From: Martin Bark @ 2016-02-25 13:23 UTC (permalink / raw)
To: buildroot
Remove 0001-ping-link-against-libm.patch as this has been fixed upstream.
See https://github.com/iputils/iputils/pull/42 and
https://github.com/iputils/iputils/commit/a5ddb78
Signed-off-by: Martin Bark <martin@barkynet.com>
---
package/iputils/0001-ping-link-against-libm.patch | 29 -----------------------
package/iputils/iputils.hash | 2 +-
package/iputils/iputils.mk | 2 +-
3 files changed, 2 insertions(+), 31 deletions(-)
delete mode 100644 package/iputils/0001-ping-link-against-libm.patch
diff --git a/package/iputils/0001-ping-link-against-libm.patch b/package/iputils/0001-ping-link-against-libm.patch
deleted file mode 100644
index d151c5b..0000000
--- a/package/iputils/0001-ping-link-against-libm.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8d189e73e660a637ae3f5a604448103ea42e397d Mon Sep 17 00:00:00 2001
-From: Martin Bark <martin@barkynet.com>
-Date: Fri, 12 Feb 2016 16:52:19 +0000
-Subject: [PATCH] ping: link against libm
-
-This commit links ping against libm because ping.c calls the math library
-function finite().
-
-Signed-off-by: Martin Bark <martin@barkynet.com>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 8b37c42..fb80f6f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -156,7 +156,7 @@ LIB_clockdiff = $(LIB_CAP)
- DEF_ping_common = $(DEF_CAP) $(DEF_IDN)
- DEF_ping6_common = $(DEF_CAP) $(DEF_IDN)
- DEF_ping = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS)
--LIB_ping = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV)
-+LIB_ping = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) -lm
-
- ping: ping_common.o ping6_common.o
- ping.o ping_common.o ping6_common.o: ping.h in6_flowlabel.h
---
-2.7.0
-
diff --git a/package/iputils/iputils.hash b/package/iputils/iputils.hash
index e32e134..1cd8ed3 100644
--- a/package/iputils/iputils.hash
+++ b/package/iputils/iputils.hash
@@ -1,2 +1,2 @@
# Locally computed
-sha256 0e98cb527fa175d1e08afb969c124e452b30968f10ec2c3b078f1440c8977a94 iputils-c8ff6feaf0442f8efd96ccb415770c54f9e84d47.tar.gz
+sha256 73de246aee1fd3cd69b1341a0c4e1b4acfa655fe6f7363fd9424824aa8bf5a57 iputils-3a86a2542c6fe29413c439bebeae11ec8a57ec7c.tar.gz
diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk
index 92e2bc9..522be9b 100644
--- a/package/iputils/iputils.mk
+++ b/package/iputils/iputils.mk
@@ -11,7 +11,7 @@
# and IPv6 updates.
# http://www.spinics.net/lists/netdev/msg279881.html
-IPUTILS_VERSION = c8ff6feaf0442f8efd96ccb415770c54f9e84d47
+IPUTILS_VERSION = 3a86a2542c6fe29413c439bebeae11ec8a57ec7c
IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION))
IPUTILS_LICENSE = GPLv2+, BSD-3c, BSD-4c
# Only includes a license file for BSD
--
2.5.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/4] package/iputils: removed dependency on openssl
2016-02-25 13:23 [Buildroot] [PATCH 1/4] package/iputils: removed dependency on openssl Martin Bark
` (2 preceding siblings ...)
2016-02-25 13:23 ` [Buildroot] [PATCH 4/4] package/iptuils: bump version to 3a86a2542c6fe29413c439bebeae11ec8a57ec7c Martin Bark
@ 2016-02-25 20:46 ` Thomas Petazzoni
3 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2016-02-25 20:46 UTC (permalink / raw)
To: buildroot
Dear Martin Bark,
On Thu, 25 Feb 2016 13:23:32 +0000, Martin Bark wrote:
> iputils does not have to be built with openssl so remove selecting
> BR2_PACKAGE_OPENSSL and make the dependency optional
>
> Signed-off-by: Martin Bark <martin@barkynet.com>
> ---
> package/iputils/Config.in | 1 -
> package/iputils/iputils.mk | 8 +++++++-
> 2 files changed, 7 insertions(+), 2 deletions(-)
All four patches applied to next, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-02-25 20:46 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-02-25 13:23 [Buildroot] [PATCH 1/4] package/iputils: removed dependency on openssl Martin Bark
2016-02-25 13:23 ` [Buildroot] [PATCH 2/4] package/iputils: add support for nettle Martin Bark
2016-02-25 13:23 ` [Buildroot] [PATCH 3/4] package/iputils: add support for libgcrypt Martin Bark
2016-02-25 13:23 ` [Buildroot] [PATCH 4/4] package/iptuils: bump version to 3a86a2542c6fe29413c439bebeae11ec8a57ec7c Martin Bark
2016-02-25 20:46 ` [Buildroot] [PATCH 1/4] package/iputils: removed dependency on openssl Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.