summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-01-07 01:31:10 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-15 11:54:50 +0000
commit4cb226954a909d0d6456bffbc857a8d966cc26c0 (patch)
treec07ba4f80d618e91a278682206213a24619fa51c /meta
parentfe47dd7bf5bf4c0cfdc8689f25ea5e2f4fa267bb (diff)
downloadpoky-4cb226954a909d0d6456bffbc857a8d966cc26c0.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch37
-rw-r--r--meta/recipes-extended/iputils/iputils_s20151218.bb (renamed from meta/recipes-extended/iputils/iputils_s20121221.bb)7
2 files changed, 3 insertions, 41 deletions
diff --git a/meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch b/meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch
deleted file mode 100644
index b9cd82ee88..0000000000
--- a/meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1Upstream-Status: Backport
2
3From 568e990d30fc7e9416e0a6f8c74ea5013921eaec Mon Sep 17 00:00:00 2001
4From: Arjan van de Ven <arjanvandeven@gmail.com>
5Date: Wed, 16 Jan 2013 03:12:15 +0900
6Subject: [PATCH] ping6: Fix build command line argument with gnutls.
7
8The ping6 command can use either openssl or gnutls...
9and the Makefile has a bunch of setup for defining which of the two to use.
10
11Unfortunately, the final -D define on the commandline to enable gnutls
12inside the ping6.c file didn't actually make it onto the gcc
13commandline.
14This patch adds the $(DEF_CRYPTO) Makefile variable to fix this gap.
15
16Signed-off-by: Arjan van de Ven <arjanvandeven@gmail.com>
17Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
18---
19 Makefile | 2 +-
20 1 files changed, 1 insertions(+), 1 deletions(-)
21
22diff --git a/Makefile b/Makefile
23index c62d9df..89249f5 100644
24--- a/Makefile
25+++ b/Makefile
26@@ -149,7 +149,7 @@ LIB_clockdiff = $(LIB_CAP)
27 DEF_ping_common = $(DEF_CAP) $(DEF_IDN)
28 DEF_ping = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS)
29 LIB_ping = $(LIB_CAP) $(LIB_IDN)
30-DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR)
31+DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR) $(DEF_CRYPTO)
32 LIB_ping6 = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) $(LIB_CRYPTO)
33
34 ping: ping_common.o
35--
361.7.2.5
37
diff --git a/meta/recipes-extended/iputils/iputils_s20121221.bb b/meta/recipes-extended/iputils/iputils_s20151218.bb
index 49913d68bd..4c3523d425 100644
--- a/meta/recipes-extended/iputils/iputils_s20121221.bb
+++ b/meta/recipes-extended/iputils/iputils_s20151218.bb
@@ -11,18 +11,17 @@ LIC_FILES_CHKSUM = "file://ping.c;beginline=1;endline=35;md5=f9ceb201733e9a6cf8f
11 file://arping.c;beginline=1;endline=11;md5=fe84301b5c2655c950f8b92a057fafa6 \ 11 file://arping.c;beginline=1;endline=11;md5=fe84301b5c2655c950f8b92a057fafa6 \
12 file://tftpd.c;beginline=1;endline=32;md5=28834bf8a91a5b8a92755dbee709ef96 " 12 file://tftpd.c;beginline=1;endline=32;md5=28834bf8a91a5b8a92755dbee709ef96 "
13 13
14DEPENDS = "gnutls docbook-utils-native sgmlspl-native libcap" 14DEPENDS = "gnutls docbook-utils-native sgmlspl-native libcap libgcrypt"
15 15
16 16
17SRC_URI = "http://www.skbuff.net/iputils/${BPN}-${PV}.tar.bz2 \ 17SRC_URI = "http://www.skbuff.net/iputils/${BPN}-${PV}.tar.bz2 \
18 file://debian/use_gethostbyname2.diff \ 18 file://debian/use_gethostbyname2.diff \
19 file://debian/targets.diff \ 19 file://debian/targets.diff \
20 file://nsgmls-path-fix.patch \ 20 file://nsgmls-path-fix.patch \
21 file://fix-build-command-line-argument-with-gnutls.patch \
22 " 21 "
23 22
24SRC_URI[md5sum] = "6072aef64205720dd1893b375e184171" 23SRC_URI[md5sum] = "8aaa7395f27dff9f57ae016d4bc753ce"
25SRC_URI[sha256sum] = "450f549fc5b620c23c5929aa6d54b7ddfc7ee1cb1e8efdc5e8bb21d8d0c5319f" 24SRC_URI[sha256sum] = "549f58d71951e52b46595829134d4e330642f522f50026917fadc349a54825a1"
26 25
27UPSTREAM_CHECK_REGEX = "iputils-(?P<pver>s\d+).tar" 26UPSTREAM_CHECK_REGEX = "iputils-(?P<pver>s\d+).tar"
28 27