diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2017-04-18 18:58:38 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-10 12:21:32 +0100 |
| commit | 56b3b440fa139c8f132b2b71dc6b8eb0ee974e7a (patch) | |
| tree | 2bb39b468042b89cd11c9aac9fb3aea5ff0e6d12 | |
| parent | 7302d099f65215fe161f16593ad6f87e1944a8f7 (diff) | |
| download | openembedded-core-contrib-56b3b440fa139c8f132b2b71dc6b8eb0ee974e7a.tar.gz | |
rpcbind: Remove uneeded patches
We were carrying patches which are no longer
needed when building rpcbind for musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-extended/rpcbind/rpcbind/musl-sunrpc.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-extended/rpcbind/rpcbind/remove-sys-queue.patch | 22 | ||||
| -rw-r--r-- | meta/recipes-extended/rpcbind/rpcbind_0.2.4.bb | 8 |
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 @@ -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", 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 @@ -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> 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 \ 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" |