summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/nfs-utils
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-09-17 10:58:06 -0700
committerSaul Wold <sgw@linux.intel.com>2012-09-18 07:44:13 -0700
commitfddcb9dd086cfb396255ae5c8f717a39c6b9c4b0 (patch)
tree02058ab47a07e2a6381c6dc20894ae481d5cf41f /meta/recipes-connectivity/nfs-utils
parent467c59495d83748d35846e8b37548182fea99cbf (diff)
downloadopenembedded-core-fddcb9dd086cfb396255ae5c8f717a39c6b9c4b0.tar.gz
openembedded-core-fddcb9dd086cfb396255ae5c8f717a39c6b9c4b0.tar.bz2
openembedded-core-fddcb9dd086cfb396255ae5c8f717a39c6b9c4b0.zip
nfs-utils: add x32 patch to fix nfsctl issue
nfsservctl syscall does not exist for x32, so return an error. Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-connectivity/nfs-utils')
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-nfsctl-x32-fix.patch30
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb3
2 files changed, 32 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-nfsctl-x32-fix.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-nfsctl-x32-fix.patch
new file mode 100644
index 0000000000..26b463136a
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-nfsctl-x32-fix.patch
@@ -0,0 +1,30 @@
+
+Upstream-Status: Pending
+
+Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
+
+--- nfs-utils-1.2.3/support/nfs/nfsctl.c.x32 2010-09-28 05:24:16.000000000 -0700
++++ nfs-utils-1.2.3/support/nfs/nfsctl.c 2011-11-30 13:34:09.369917161 -0800
+@@ -12,15 +12,22 @@
+
+ #include <unistd.h>
+ #include <asm/unistd.h>
++#include <errno.h>
+ #include "nfslib.h"
+
+ /* compatibility hack... */
+ #ifndef __NR_nfsctl
++#ifdef __NR_nfsservctl
+ #define __NR_nfsctl __NR_nfsservctl
+ #endif
++#endif
+
+ int
+ nfsctl (int cmd, struct nfsctl_arg * argp, union nfsctl_res * resp)
+ {
++#ifdef __NR_nfsctl
+ return syscall (__NR_nfsctl, cmd, argp, resp);
++#else
++ return -ENOSYS;
++#endif
+ }
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
index eb18aaaa94..5a4a7e7cbf 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.3.bb
@@ -12,11 +12,12 @@ DEPENDS = "libcap libnfsidmap libevent util-linux tcp-wrappers"
RDEPENDS_${PN} = "portmap"
RRECOMMENDS_${PN} = "kernel-module-nfsd"
-PR = "r4"
+PR = "r5"
SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \
file://nfs-utils-1.0.6-uclibc.patch \
file://nfs-utils-1.2.3-uclibc-libio.h.patch \
+ file://nfs-utils-nfsctl-x32-fix.patch \
file://nfsserver"
SRC_URI[md5sum] = "1131dc5f27c4f3905a6e7ee0d594fd4d"