iputils: s20121221 -> s20151218
* Remove fix-build-command-line-argument-with-gnutls.patch which is already in the source. * Add libgcrypt to DEPENDS since it depends on it. (From OE-Core rev: 119a121e4dbf48db67544c4c7fca40a1abcf1146) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
fe47dd7bf5
commit
4cb226954a
|
@ -1,37 +0,0 @@
|
|||
Upstream-Status: Backport
|
||||
|
||||
From 568e990d30fc7e9416e0a6f8c74ea5013921eaec Mon Sep 17 00:00:00 2001
|
||||
From: Arjan van de Ven <arjanvandeven@gmail.com>
|
||||
Date: Wed, 16 Jan 2013 03:12:15 +0900
|
||||
Subject: [PATCH] ping6: Fix build command line argument with gnutls.
|
||||
|
||||
The ping6 command can use either openssl or gnutls...
|
||||
and the Makefile has a bunch of setup for defining which of the two to use.
|
||||
|
||||
Unfortunately, the final -D define on the commandline to enable gnutls
|
||||
inside the ping6.c file didn't actually make it onto the gcc
|
||||
commandline.
|
||||
This patch adds the $(DEF_CRYPTO) Makefile variable to fix this gap.
|
||||
|
||||
Signed-off-by: Arjan van de Ven <arjanvandeven@gmail.com>
|
||||
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index c62d9df..89249f5 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -149,7 +149,7 @@ LIB_clockdiff = $(LIB_CAP)
|
||||
DEF_ping_common = $(DEF_CAP) $(DEF_IDN)
|
||||
DEF_ping = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS)
|
||||
LIB_ping = $(LIB_CAP) $(LIB_IDN)
|
||||
-DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR)
|
||||
+DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR) $(DEF_CRYPTO)
|
||||
LIB_ping6 = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) $(LIB_CRYPTO)
|
||||
|
||||
ping: ping_common.o
|
||||
--
|
||||
1.7.2.5
|
||||
|
|
@ -11,18 +11,17 @@ LIC_FILES_CHKSUM = "file://ping.c;beginline=1;endline=35;md5=f9ceb201733e9a6cf8f
|
|||
file://arping.c;beginline=1;endline=11;md5=fe84301b5c2655c950f8b92a057fafa6 \
|
||||
file://tftpd.c;beginline=1;endline=32;md5=28834bf8a91a5b8a92755dbee709ef96 "
|
||||
|
||||
DEPENDS = "gnutls docbook-utils-native sgmlspl-native libcap"
|
||||
DEPENDS = "gnutls docbook-utils-native sgmlspl-native libcap libgcrypt"
|
||||
|
||||
|
||||
SRC_URI = "http://www.skbuff.net/iputils/${BPN}-${PV}.tar.bz2 \
|
||||
file://debian/use_gethostbyname2.diff \
|
||||
file://debian/targets.diff \
|
||||
file://nsgmls-path-fix.patch \
|
||||
file://fix-build-command-line-argument-with-gnutls.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "6072aef64205720dd1893b375e184171"
|
||||
SRC_URI[sha256sum] = "450f549fc5b620c23c5929aa6d54b7ddfc7ee1cb1e8efdc5e8bb21d8d0c5319f"
|
||||
SRC_URI[md5sum] = "8aaa7395f27dff9f57ae016d4bc753ce"
|
||||
SRC_URI[sha256sum] = "549f58d71951e52b46595829134d4e330642f522f50026917fadc349a54825a1"
|
||||
|
||||
UPSTREAM_CHECK_REGEX = "iputils-(?P<pver>s\d+).tar"
|
||||
|
Loading…
Reference in New Issue