summaryrefslogtreecommitdiff
path: root/packages/nfs-utils
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2006-09-02 12:01:47 +0000
committerKoen Kooi <koen@openembedded.org>2006-09-02 12:01:47 +0000
commit115fb071f3b122307a4599902f6ab195b69ac6d2 (patch)
treed6d2d535587b720c408acf8026bba81ac3a945ba /packages/nfs-utils
parent8f2755bcfe2318ab67491d2611c500ecc3609a6b (diff)
nfs-utils: fix #1378 and fix RDEPENDS on a kernel-module
* NEVER (R)DEPEND on a kernel-module, since those can be built-in, use RRECOMMENDS instead
Diffstat (limited to 'packages/nfs-utils')
-rw-r--r--packages/nfs-utils/files/nfs-utils-1.0.6-uclibc.patch18
-rw-r--r--packages/nfs-utils/nfs-utils_1.0.6.bb8
2 files changed, 23 insertions, 3 deletions
diff --git a/packages/nfs-utils/files/nfs-utils-1.0.6-uclibc.patch b/packages/nfs-utils/files/nfs-utils-1.0.6-uclibc.patch
new file mode 100644
index 0000000000..ebd3276be2
--- /dev/null
+++ b/packages/nfs-utils/files/nfs-utils-1.0.6-uclibc.patch
@@ -0,0 +1,18 @@
+--- ./support/nfs/svc_socket.c.orig 2004-12-12 06:43:52.000000000 +0000
++++ ./support/nfs/svc_socket.c 2004-12-12 06:50:04.000000000 +0000
+@@ -66,6 +66,7 @@
+ __bzero ((char *) &addr, sizeof (addr));
+ addr.sin_family = AF_INET;
+
++#ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */
+ ret = getrpcbynumber_r (number, &rpcbuf, rpcdata, sizeof rpcdata,
+ &rpcp);
+ if (ret == 0 && rpcp != NULL)
+@@ -99,6 +100,7 @@
+ }
+ }
+ else
++#endif
+ {
+ if (bindresvport (sock, &addr))
+ {
diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb
index 4f5e64b352..076ef4cff1 100644
--- a/packages/nfs-utils/nfs-utils_1.0.6.bb
+++ b/packages/nfs-utils/nfs-utils_1.0.6.bb
@@ -3,12 +3,13 @@ PRIORITY = "optional"
SECTION = "console/network"
MAINTAINER = "dyoung <dyoung@thestuffguy.com>"
LICENSE = "GPL"
-PR = "r6"
+PR = "r7"
SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \
file://acinclude-lossage.patch;patch=1 \
file://rpcgen-lossage.patch;patch=1 \
file://stat-include.patch;patch=1 \
+ file://nfs-utils-1.0.6-uclibc.patch;patch=1 \
file://nfsserver \
file://forgotten-defines"
@@ -16,9 +17,10 @@ S = ${WORKDIR}/nfs-utils-${PV}/
PARALLEL_MAKE = ""
-# Only kernel-module-nfsd is required here - the nfsd module will
+# Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will
# pull in the remainder of the dependencies.
-RDEPENDS = "portmap kernel-module-nfsd"
+RDEPENDS = "portmap"
+RRECOMMENDS = "kernel-module-nfsd"
INITSCRIPT_NAME = "nfsserver"
# The server has no dependencies at the user run levels, so just put