diff options
Diffstat (limited to 'yocto-poky/meta/recipes-extended/iputils')
-rw-r--r-- | yocto-poky/meta/recipes-extended/iputils/files/0001-Fix-header-inclusion-for-musl.patch | 92 | ||||
-rw-r--r-- | yocto-poky/meta/recipes-extended/iputils/files/0001-Intialize-struct-elements-by-name.patch | 52 | ||||
-rw-r--r-- | yocto-poky/meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch | 37 | ||||
-rw-r--r-- | yocto-poky/meta/recipes-extended/iputils/iputils_s20151218.bb (renamed from yocto-poky/meta/recipes-extended/iputils/iputils_s20121221.bb) | 13 |
4 files changed, 153 insertions, 41 deletions
diff --git a/yocto-poky/meta/recipes-extended/iputils/files/0001-Fix-header-inclusion-for-musl.patch b/yocto-poky/meta/recipes-extended/iputils/files/0001-Fix-header-inclusion-for-musl.patch new file mode 100644 index 000000000..20ef07e44 --- /dev/null +++ b/yocto-poky/meta/recipes-extended/iputils/files/0001-Fix-header-inclusion-for-musl.patch @@ -0,0 +1,92 @@ +From be0bb81d72fea4d20da74f4f2236aa145684f332 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 6 Jan 2016 14:14:22 -0800 +Subject: [PATCH] Fix header inclusion for musl + +Fix errors e.g. + +In file included from tracepath.c:17:0: +/usr/include/linux/errqueue.h:33:18: +error: array type has incomplete element type 'struct timespec' + struct timespec ts[3]; + ^ +tracepath.c: In function 'main': +tracepath.c:329:16: error: 'INT_MAX' undeclared (first use in this +function) + overhead, INT_MAX); + ^ +tracepath.c:329:16: note: each undeclared identifier is reported only +once for each function it appears in +Makefile:131: recipe for target 'tracepath.o' failed +make: *** [tracepath.o] Error 1 + +ping_common.c: In function 'main_loop': +ping_common.c:756:15: error: 'HZ' undeclared (first use in this +function) + if (1000 % HZ == 0 ? next <= 1000 / HZ : (next < INT_MAX / HZ && +next * HZ <= 1000)) { + +protocols/timed.h is not needed and is absent in musl + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + clockdiff.c | 1 - + ping_common.c | 1 + + tracepath.c | 2 ++ + tracepath6.c | 1 + + 4 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/clockdiff.c b/clockdiff.c +index 7c1ea1b..1d6341e 100644 +--- a/clockdiff.c ++++ b/clockdiff.c +@@ -14,7 +14,6 @@ + #include <netinet/ip.h> + #include <netinet/ip_icmp.h> + #define TSPTYPES +-#include <protocols/timed.h> + #include <fcntl.h> + #include <netdb.h> + #include <arpa/inet.h> +diff --git a/ping_common.c b/ping_common.c +index 7f82851..3ce699d 100644 +--- a/ping_common.c ++++ b/ping_common.c +@@ -2,6 +2,7 @@ + #include <ctype.h> + #include <sched.h> + #include <math.h> ++#include <asm-generic/param.h> + + int options; + +diff --git a/tracepath.c b/tracepath.c +index 89e6d16..c9d6ddd 100644 +--- a/tracepath.c ++++ b/tracepath.c +@@ -12,6 +12,8 @@ + #include <stdio.h> + #include <stdlib.h> + #include <unistd.h> ++#include <limits.h> ++#include <time.h> + #include <sys/socket.h> + #include <linux/types.h> + #include <linux/errqueue.h> +diff --git a/tracepath6.c b/tracepath6.c +index 126fadf..9d5745c 100644 +--- a/tracepath6.c ++++ b/tracepath6.c +@@ -12,6 +12,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <unistd.h> ++#include <limits.h> + #include <sys/socket.h> + #include <netinet/in.h> + #include <netinet/icmp6.h> +-- +2.6.4 + diff --git a/yocto-poky/meta/recipes-extended/iputils/files/0001-Intialize-struct-elements-by-name.patch b/yocto-poky/meta/recipes-extended/iputils/files/0001-Intialize-struct-elements-by-name.patch new file mode 100644 index 000000000..6da01dc61 --- /dev/null +++ b/yocto-poky/meta/recipes-extended/iputils/files/0001-Intialize-struct-elements-by-name.patch @@ -0,0 +1,52 @@ +From 000629f74908a2a95f6104444c77ad93cf40d62d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 13 Jan 2016 08:50:50 +0000 +Subject: [PATCH] Intialize struct elements by name + +makes it portable across glibc and musl + +Fixes errors + +| ping.c: In function 'send_probe': +| ping.c:735:19: warning: initialization makes integer from pointer +without a cast [-Wint-conversion] +| &iov, 1, &cmsg, 0, 0 }; +| ^ +| ping.c:735:19: note: (near initialization for 'm.__pad1') +| ping.c:735:19: error: initializer element is not computable at load +time +| ping.c:735:19: note: (near initialization for 'm.__pad1') +| make: *** [ping.o] Error 1 + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + ping.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/ping.c b/ping.c +index 4989760..e67f381 100644 +--- a/ping.c ++++ b/ping.c +@@ -731,8 +731,15 @@ int send_probe() + + do { + static struct iovec iov = {outpack, 0}; +- static struct msghdr m = { &whereto, sizeof(whereto), +- &iov, 1, &cmsg, 0, 0 }; ++ static struct msghdr m = { ++ .msg_name = &whereto, ++ .msg_namelen = sizeof(whereto), ++ .msg_iov = &iov, ++ .msg_iovlen = 1, ++ .msg_control = &cmsg, ++ .msg_controllen = 0, ++ .msg_flags= 0, ++ }; + m.msg_controllen = cmsg_len; + iov.iov_len = cc; + +-- +2.7.0 + diff --git a/yocto-poky/meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch b/yocto-poky/meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch deleted file mode 100644 index b9cd82ee8..000000000 --- a/yocto-poky/meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch +++ /dev/null @@ -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 - diff --git a/yocto-poky/meta/recipes-extended/iputils/iputils_s20121221.bb b/yocto-poky/meta/recipes-extended/iputils/iputils_s20151218.bb index e87a32a7d..715045470 100644 --- a/yocto-poky/meta/recipes-extended/iputils/iputils_s20121221.bb +++ b/yocto-poky/meta/recipes-extended/iputils/iputils_s20151218.bb @@ -11,18 +11,23 @@ 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 \ + file://0001-Fix-header-inclusion-for-musl.patch \ + file://0001-Intialize-struct-elements-by-name.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" + +EXTRA_OEMAKE = "-e MAKEFLAGS=" do_compile () { oe_runmake 'CC=${CC} -D_GNU_SOURCE' VPATH="${STAGING_LIBDIR}:${STAGING_DIR_HOST}/${base_libdir}" all man |