mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-01 15:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

rpcbind: Remove uneeded patches

Browse Source 
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>
This commit is contained in:
Khem Raj
2017-04-18 18:58:38 -07:00
committed by Richard Purdie
parent c564d57c5b
commit b7bc9156a7
3 changed files with 0 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
meta/recipes-extended/rpcbind/rpcbind/musl-sunrpc.patch
View File

@@ -1,30 +0,0 @@
The musl implementation of getaddrinfo and getservbyname does not
aliases. As a workaround we use "sunprc" instead of "portmapper"
ported from alpine linux
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: rpcbind-0.2.2/src/rpcbind.c
===================================================================
--- rpcbind-0.2.2.orig/src/rpcbind.c
+++ rpcbind-0.2.2/src/rpcbind.c
@@ -491,7 +491,7 @@ init_transport(struct netconfig *nconf)
if ((aicode = getaddrinfo(hosts[nhostsbak],
servname, &hints, &res)) != 0) {
if ((aicode = getaddrinfo(hosts[nhostsbak],
- "portmapper", &hints, &res)) != 0) {
+ "sunrpc", &hints, &res)) != 0) {
syslog(LOG_ERR,
"cannot get local address for %s: %s",
nconf->nc_netid, gai_strerror(aicode));
@@ -564,7 +564,7 @@ init_transport(struct netconfig *nconf)
if ((strcmp(nconf->nc_netid, "local") != 0) &&
(strcmp(nconf->nc_netid, "unix") != 0)) {
if ((aicode = getaddrinfo(NULL, servname, &hints, &res))!= 0) {
- if ((aicode = getaddrinfo(NULL, "portmapper", &hints, &res))!= 0) {
+ if ((aicode = getaddrinfo(NULL, "sunrpc", &hints, &res))!= 0) {
printf("cannot get local address for %s: %s", nconf->nc_netid, gai_strerror(aicode));
syslog(LOG_ERR,
"cannot get local address for %s: %s",

22
meta/recipes-extended/rpcbind/rpcbind/remove-sys-queue.patch
View File

@@ -1,22 +0,0 @@
musl does not provide this header and here is reasoning
http://wiki.musl-libc.org/wiki/FAQ#Q:_why_is_sys.2Fqueue.h_not_included_.3F
So include it only when __GLIBC__ is defined which is true for uclibc and glibc
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: rpcbind-0.2.2/src/util.c
===================================================================
--- rpcbind-0.2.2.orig/src/util.c
+++ rpcbind-0.2.2/src/util.c
@@ -41,7 +41,9 @@
#include <sys/types.h>
#include <sys/socket.h>
+#ifdef __GLIBC__
#include <sys/queue.h>
+#endif
#include <net/if.h>
#include <netinet/in.h>
#include <ifaddrs.h>

8
meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb
View File

@@ -12,18 +12,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b46486e4c4a416602693a711bb5bfa39 \
SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
file://init.d \
file://remove-sys-queue.patch \
${UCLIBCPATCHES} \
${MUSLPATCHES} \
file://rpcbind.conf \
file://rpcbind.socket \
file://rpcbind.service \
"
MUSLPATCHES_libc-musl = "file://musl-sunrpc.patch"
UCLIBCPATCHES ?= ""
MUSLPATCHES ?= ""
SRC_URI[md5sum] = "cf10cd41ed8228fc54c316191c1f07fe"
SRC_URI[sha256sum] = "074a9a530dc7c11e0d905aa59bcb0847c009313f02e98d3d798aa9568f414c66"