summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-09-17 10:58:06 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-19 17:56:28 +0100
commit7999c9b1aac4fb7ca5608545eb7a8e63fd117a60 (patch)
tree4d3057289094d381335cb497f26489d028390108 /meta/recipes-connectivity
parentd72ed271e7c0e27e2d0fb2241d3799ab3e54e113 (diff)
downloadpoky-7999c9b1aac4fb7ca5608545eb7a8e63fd117a60.tar.gz
nfs-utils: add x32 patch to fix nfsctl issue
nfsservctl syscall does not exist for x32, so return an error. (From OE-Core rev: fddcb9dd086cfb396255ae5c8f717a39c6b9c4b0) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-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 @@
1
2Upstream-Status: Pending
3
4Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
5
6--- nfs-utils-1.2.3/support/nfs/nfsctl.c.x32 2010-09-28 05:24:16.000000000 -0700
7+++ nfs-utils-1.2.3/support/nfs/nfsctl.c 2011-11-30 13:34:09.369917161 -0800
8@@ -12,15 +12,22 @@
9
10 #include <unistd.h>
11 #include <asm/unistd.h>
12+#include <errno.h>
13 #include "nfslib.h"
14
15 /* compatibility hack... */
16 #ifndef __NR_nfsctl
17+#ifdef __NR_nfsservctl
18 #define __NR_nfsctl __NR_nfsservctl
19 #endif
20+#endif
21
22 int
23 nfsctl (int cmd, struct nfsctl_arg * argp, union nfsctl_res * resp)
24 {
25+#ifdef __NR_nfsctl
26 return syscall (__NR_nfsctl, cmd, argp, resp);
27+#else
28+ return -ENOSYS;
29+#endif
30 }
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"
12RDEPENDS_${PN} = "portmap" 12RDEPENDS_${PN} = "portmap"
13RRECOMMENDS_${PN} = "kernel-module-nfsd" 13RRECOMMENDS_${PN} = "kernel-module-nfsd"
14 14
15PR = "r4" 15PR = "r5"
16 16
17SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \ 17SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.bz2 \
18 file://nfs-utils-1.0.6-uclibc.patch \ 18 file://nfs-utils-1.0.6-uclibc.patch \
19 file://nfs-utils-1.2.3-uclibc-libio.h.patch \ 19 file://nfs-utils-1.2.3-uclibc-libio.h.patch \
20 file://nfs-utils-nfsctl-x32-fix.patch \
20 file://nfsserver" 21 file://nfsserver"
21 22
22SRC_URI[md5sum] = "1131dc5f27c4f3905a6e7ee0d594fd4d" 23SRC_URI[md5sum] = "1131dc5f27c4f3905a6e7ee0d594fd4d"