[oe-commits] org.oe.dev nfs-utils: fix #1378 and fix RDEPENDS on a kernel-module

[koen commit]

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

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 4ce409402d3a4d6242c33a93272d0721659ad13f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4ce409402d3a4d6242c33a93272d0721659ad13f
Files:
1
packages/nfs-utils/files/nfs-utils-1.0.6-uclibc.patch
packages/nfs-utils/nfs-utils_1.0.6.bb
Diffs:

#
# mt diff -ra78ef645fc94ec1638720a58c27b72f46a83eda3 -r4ce409402d3a4d6242c33a93272d0721659ad13f
#
# 
# 
# add_file "packages/nfs-utils/files/nfs-utils-1.0.6-uclibc.patch"
#  content [7a08d79703938f9a0d11f3f9f1aaaabe10b4f624]
# 
# patch "packages/nfs-utils/nfs-utils_1.0.6.bb"
#  from [83f6c2cf1ac26e27412668bbf22f4107cb05030e]
#    to [60d54d50efa384289b0b88477e7011e043c4f6c7]
# 
============================================================
--- packages/nfs-utils/files/nfs-utils-1.0.6-uclibc.patch	7a08d79703938f9a0d11f3f9f1aaaabe10b4f624
+++ packages/nfs-utils/files/nfs-utils-1.0.6-uclibc.patch	7a08d79703938f9a0d11f3f9f1aaaabe10b4f624
@@ -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))
+ 	{
============================================================
--- packages/nfs-utils/nfs-utils_1.0.6.bb	83f6c2cf1ac26e27412668bbf22f4107cb05030e
+++ packages/nfs-utils/nfs-utils_1.0.6.bb	60d54d50efa384289b0b88477e7011e043c4f6c7
@@ -1,14 +1,15 @@ LICENSE = "GPL"
 DESCRIPTION = "userspace utilities for kernel nfs"
 PRIORITY = "optional"
 SECTION = "console/network"
 MAINTAINER = "dyoung <dyoung at 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 @@ PARALLEL_MAKE = ""
 
 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