diff options
| author |   Joe Slater <jslater@windriver.com> | 2016-08-18 14:56:06 -0700 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2016-09-05 13:34:11 -0400 |
| commit | 490d792737a9ed00cab3d9e33d4843746150b14b (patch) | |
| tree | ff63f8b04c6485c9931f0a8edb0246a251fa8fa1 /meta-networking/recipes-support/nis | |
| parent | c7e8da38198deb4b8da3536ac348623cfd306c5a (diff) | |
| download | meta-openembedded-490d792737a9ed00cab3d9e33d4843746150b14b.tar.gz | |
yp-tools: fix compile errors
Fix two fatal warnings. The cast error only
occurs for some architectures.
Not applicable to yp-tools-4.x.
Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking/recipes-support/nis')
| -rw-r--r-- | meta-networking/recipes-support/nis/yp-tools/alignment-cheat.patch | 52 | ||||
| -rw-r--r-- | meta-networking/recipes-support/nis/yp-tools_3.3.bb | 3 |
2 files changed, 53 insertions, 2 deletions
diff --git a/meta-networking/recipes-support/nis/yp-tools/alignment-cheat.patch b/meta-networking/recipes-support/nis/yp-tools/alignment-cheat.patch new file mode 100644 index 0000000000..be9b62b8cc --- /dev/null +++ b/meta-networking/recipes-support/nis/yp-tools/alignment-cheat.patch @@ -0,0 +1,52 @@ +yp-tools: avoid fatal cast warning + +The way casting is done, we will get a fatal alignment warning on some +architectures. This patch cheats our way around this. + +We also eliminate an unused constant which causes a fatal warning. + +Upstream-status: Inappropriate [code does not exist in version 4.x] + +Signed-off-by: Joe Slater <jslater@windriver.com> + +--- a/lib/do_ypcall.c ++++ b/lib/do_ypcall.c +@@ -44,7 +44,6 @@ struct dom_binding + typedef struct dom_binding dom_binding; + + static const struct timeval RPCTIMEOUT = {25, 0}; +-static const struct timeval UDPTIMEOUT = {5, 0}; + static int const MAXTRIES = 2; + static pthread_mutex_t ypbindlist_lock = PTHREAD_MUTEX_INITIALIZER; + static dom_binding *ypbindlist = NULL; +@@ -381,7 +380,7 @@ __ypclnt_call (u_long prog, xdrproc_t xa + + int + do_ypcall (const char *domain, u_long prog, xdrproc_t xargs, +- caddr_t req, xdrproc_t xres, caddr_t resp) ++ caddr_t req, xdrproc_t xres, void *resp) + { + dom_binding *ydb; + int status; +@@ -450,7 +449,7 @@ do_ypcall (const char *domain, u_long pr + /* Like do_ypcall, but translate the status value if necessary. */ + int + do_ypcall_tr (const char *domain, u_long prog, xdrproc_t xargs, +- caddr_t req, xdrproc_t xres, caddr_t resp) ++ caddr_t req, xdrproc_t xres, void *resp) + { + int status = do_ypcall (domain, prog, xargs, req, xres, resp); + if (status == YPERR_SUCCESS) +--- a/lib/internal.h ++++ b/lib/internal.h +@@ -17,8 +17,8 @@ + #define _INTERNAL_H_ + + extern int do_ypcall (const char *domain, u_long prog, xdrproc_t xargs, +- caddr_t req, xdrproc_t xres, caddr_t resp); ++ caddr_t req, xdrproc_t xres, void *resp); + extern int do_ypcall_tr (const char *domain, u_long prog, xdrproc_t xargs, +- caddr_t req, xdrproc_t xres, caddr_t resp); ++ caddr_t req, xdrproc_t xres, void *resp); + extern int yp_maplist (const char *, struct ypmaplist **); + #endif diff --git a/meta-networking/recipes-support/nis/yp-tools_3.3.bb b/meta-networking/recipes-support/nis/yp-tools_3.3.bb index b89f0b84aa..69217fad1e 100644 --- a/meta-networking/recipes-support/nis/yp-tools_3.3.bb +++ b/meta-networking/recipes-support/nis/yp-tools_3.3.bb @@ -11,11 +11,10 @@ ypwhich, yppasswd, domainname, nisdomainname \ and ypdomainname. \ " -PNBLACKLIST[yp-tools] ?= "BROKEN: fails to build for qemuarm." - SRC_URI = "http://www.linux-nis.org/download/yp-tools/${BP}.tar.bz2 \ file://domainname.service \ file://yp-tools-ipv4-ipv6-Provide-an-in-place-version-of-mapv4v6addr.patch \ + file://alignment-cheat.patch \ " SRC_URI[md5sum] = "acebeecc11a73fb8097503670344834c" SRC_URI[sha256sum] = "812be817df3d4c25813552be336c6c6ad5aedaf65611b81af3ad9f98fb3c2e50" |