Module Name: src
Committed By: christos
Date: Sun Nov 8 21:05:39 UTC 2015
Modified Files:
src/tests/fs/nfs/nfsservice: Makefile
Removed Files:
src/tests/fs/nfs/nfsservice: mountd.c
src/tests/fs/nfs/nfsservice/rpcbind: Makefile.inc
Log Message:
Use the regular mountd, and include the rpcbind stuff here.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/fs/nfs/nfsservice/Makefile
cvs rdiff -u -r1.11 -r0 src/tests/fs/nfs/nfsservice/mountd.c
cvs rdiff -u -r1.4 -r0 src/tests/fs/nfs/nfsservice/rpcbind/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/nfs/nfsservice/Makefile
diff -u src/tests/fs/nfs/nfsservice/Makefile:1.8 src/tests/fs/nfs/nfsservice/Makefile:1.9
--- src/tests/fs/nfs/nfsservice/Makefile:1.8 Wed Jan 7 23:00:31 2015
+++ src/tests/fs/nfs/nfsservice/Makefile Sun Nov 8 16:05:39 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/01/08 04:00:31 pooka Exp $
+# $NetBSD: Makefile,v 1.9 2015/11/08 21:05:39 christos Exp $
#
NOMAN= 1
@@ -27,11 +27,24 @@ LDADD+= -lrumpnet -lrumpkern_sysproxy -l
LDADD+= -lpthread -lutil
CPPFLAGS+= -DDEBUG -DMOUNT_NOMAIN -D_REENTRANT
-CPPFLAGS+= -DRUMP_SYS_NETWORKING
+CPPFLAGS+= -DRUMP_SYS_NETWORKING -DMOUNTD_RUMP
-.PATH: ${.CURDIR}/rpcbind
-.include "rpcbind/Makefile.inc"
+.PATH.c: ${NETBSDSRCDIR}/usr.sbin/mountd
-WARNS= 2
+# RPCBIND
+.PATH.c: ${NETBSDSRCDIR}/usr.sbin/rpcbind
+SRCS.rumpnfsd+= check_bound.c rpcb_stat.c rpcb_svc_4.c rpcbind.c pmap_svc.c \
+ rpcb_svc.c rpcb_svc_com.c security.c util.c
+
+LIBRPCDIR= ${NETBSDSRCDIR}/lib/libc/rpc
+
+CPPFLAGS+= -I${LIBRPCDIR} -DPORTMAP -DLIBWRAP -DRPCBIND_RUMP
+
+# Uncomment these to get any useful output from 'rpcbind -d'
+# CPPFLAGS+= -DRPCBIND_DEBUG
+# CPPFLAGS+= -DSVC_RUN_DEBUG
+
+LDADD+= -lwrap -lutil
+DPADD+= ${LIBWRAP} ${LIBUTIL}
.include <bsd.test.mk>
