summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-04-18 18:58:38 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-05-11 16:59:18 +0100
commitb7bc9156a7447afe752824a43bba7292c3322ed5 (patch)
tree5181a4acb5864b8ac7f344fff1e1d97e2e93779b /meta/recipes-extended
parentc564d57c5b9a8fca9afc8fd2632185b20231a75a (diff)
downloadpoky-b7bc9156a7447afe752824a43bba7292c3322ed5.tar.gz
rpcbind: Remove uneeded patches
We were carrying patches which are no longer needed when building rpcbind for musl (From OE-Core rev: 56b3b440fa139c8f132b2b71dc6b8eb0ee974e7a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/rpcbind/rpcbind/musl-sunrpc.patch30
-rw-r--r--meta/recipes-extended/rpcbind/rpcbind/remove-sys-queue.patch22
-rw-r--r--meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb8
3 files changed, 0 insertions, 60 deletions
diff --git a/meta/recipes-extended/rpcbind/rpcbind/musl-sunrpc.patch b/meta/recipes-extended/rpcbind/rpcbind/musl-sunrpc.patch
deleted file mode 100644
index 6fbc6364cb..0000000000
--- a/meta/recipes-extended/rpcbind/rpcbind/musl-sunrpc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1The musl implementation of getaddrinfo and getservbyname does not
2aliases. As a workaround we use "sunprc" instead of "portmapper"
3
4ported from alpine linux
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7Upstream-Status: Pending
8
9Index: rpcbind-0.2.2/src/rpcbind.c
10===================================================================
11--- rpcbind-0.2.2.orig/src/rpcbind.c
12+++ rpcbind-0.2.2/src/rpcbind.c
13@@ -491,7 +491,7 @@ init_transport(struct netconfig *nconf)
14 if ((aicode = getaddrinfo(hosts[nhostsbak],
15 servname, &hints, &res)) != 0) {
16 if ((aicode = getaddrinfo(hosts[nhostsbak],
17- "portmapper", &hints, &res)) != 0) {
18+ "sunrpc", &hints, &res)) != 0) {
19 syslog(LOG_ERR,
20 "cannot get local address for %s: %s",
21 nconf->nc_netid, gai_strerror(aicode));
22@@ -564,7 +564,7 @@ init_transport(struct netconfig *nconf)
23 if ((strcmp(nconf->nc_netid, "local") != 0) &&
24 (strcmp(nconf->nc_netid, "unix") != 0)) {
25 if ((aicode = getaddrinfo(NULL, servname, &hints, &res))!= 0) {
26- if ((aicode = getaddrinfo(NULL, "portmapper", &hints, &res))!= 0) {
27+ if ((aicode = getaddrinfo(NULL, "sunrpc", &hints, &res))!= 0) {
28 printf("cannot get local address for %s: %s", nconf->nc_netid, gai_strerror(aicode));
29 syslog(LOG_ERR,
30 "cannot get local address for %s: %s",
diff --git a/meta/recipes-extended/rpcbind/rpcbind/remove-sys-queue.patch b/meta/recipes-extended/rpcbind/rpcbind/remove-sys-queue.patch
deleted file mode 100644
index 84fc974fdf..0000000000
--- a/meta/recipes-extended/rpcbind/rpcbind/remove-sys-queue.patch
+++ /dev/null
@@ -1,22 +0,0 @@
1musl does not provide this header and here is reasoning
2http://wiki.musl-libc.org/wiki/FAQ#Q:_why_is_sys.2Fqueue.h_not_included_.3F
3
4So include it only when __GLIBC__ is defined which is true for uclibc and glibc
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7Upstream-Status: Pending
8
9Index: rpcbind-0.2.2/src/util.c
10===================================================================
11--- rpcbind-0.2.2.orig/src/util.c
12+++ rpcbind-0.2.2/src/util.c
13@@ -41,7 +41,9 @@
14
15 #include <sys/types.h>
16 #include <sys/socket.h>
17+#ifdef __GLIBC__
18 #include <sys/queue.h>
19+#endif
20 #include <net/if.h>
21 #include <netinet/in.h>
22 #include <ifaddrs.h>
diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb
index 4911fe51e8..d3ebcb3b25 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb
@@ -12,18 +12,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b46486e4c4a416602693a711bb5bfa39 \
12 12
13SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \ 13SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
14 file://init.d \ 14 file://init.d \
15 file://remove-sys-queue.patch \
16 ${UCLIBCPATCHES} \
17 ${MUSLPATCHES} \
18 file://rpcbind.conf \ 15 file://rpcbind.conf \
19 file://rpcbind.socket \ 16 file://rpcbind.socket \
20 file://rpcbind.service \ 17 file://rpcbind.service \
21 " 18 "
22MUSLPATCHES_libc-musl = "file://musl-sunrpc.patch"
23
24UCLIBCPATCHES ?= ""
25MUSLPATCHES ?= ""
26
27SRC_URI[md5sum] = "cf10cd41ed8228fc54c316191c1f07fe" 19SRC_URI[md5sum] = "cf10cd41ed8228fc54c316191c1f07fe"
28SRC_URI[sha256sum] = "074a9a530dc7c11e0d905aa59bcb0847c009313f02e98d3d798aa9568f414c66" 20SRC_URI[sha256sum] = "074a9a530dc7c11e0d905aa59bcb0847c009313f02e98d3d798aa9568f414c66"
29 21