Sun Nov 8 21:05:39 2015 UTC ()
Use the regular mountd, and include the rpcbind stuff here.


(christos)
diff -r1.8 -r1.9 src/tests/fs/nfs/nfsservice/Makefile
diff -r1.11 -r0 src/tests/fs/nfs/nfsservice/mountd.c
diff -r1.4 -r0 src/tests/fs/nfs/nfsservice/rpcbind/Makefile.inc

cvs diff -r1.8 -r1.9 src/tests/fs/nfs/nfsservice/Makefile (expand / switch to unified diff)

--- src/tests/fs/nfs/nfsservice/Makefile 2015/01/08 04:00:31 1.8
+++ src/tests/fs/nfs/nfsservice/Makefile 2015/11/08 21:05:39 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.8 2015/01/08 04:00:31 pooka Exp $ 1# $NetBSD: Makefile,v 1.9 2015/11/08 21:05:39 christos Exp $
2# 2#
3 3
4NOMAN= 1 4NOMAN= 1
5.include <bsd.own.mk> 5.include <bsd.own.mk>
6 6
7TESTSDIR= ${TESTSBASE}/fs/nfs/nfsservice 7TESTSDIR= ${TESTSBASE}/fs/nfs/nfsservice
8ATFFILE= no 8ATFFILE= no
9 9
10# install pre-generated /etc/exports 10# install pre-generated /etc/exports
11FILES+= exports 11FILES+= exports
12FILESDIR_exports= ${TESTSDIR} 12FILESDIR_exports= ${TESTSDIR}
13 13
14VFSTESTDIR != cd ${.CURDIR}/../../common && ${PRINTOBJDIR} 14VFSTESTDIR != cd ${.CURDIR}/../../common && ${PRINTOBJDIR}
@@ -17,21 +17,34 @@ LDADD+= -L${VFSTESTDIR} -Wl,--whole-arch @@ -17,21 +17,34 @@ LDADD+= -L${VFSTESTDIR} -Wl,--whole-arch
17TESTS_C=rumpnfsd 17TESTS_C=rumpnfsd
18 18
19SRCS.rumpnfsd= rumpnfsd.c nfsd.c mountd.c getmntinfo.c 19SRCS.rumpnfsd= rumpnfsd.c nfsd.c mountd.c getmntinfo.c
20 20
21LDADD+= -lrumpfs_nfsserver -lrumpfs_nfs # NFS support 21LDADD+= -lrumpfs_nfsserver -lrumpfs_nfs # NFS support
22LDADD+= -lrumpdev_disk -lrumpdev # disk devices 22LDADD+= -lrumpdev_disk -lrumpdev # disk devices
23LDADD+= -lrumpfs_ffs -lrumpvfs # FFS 23LDADD+= -lrumpfs_ffs -lrumpvfs # FFS
24LDADD+= -lrumpnet_netinet -lrumpnet_net -lrumpnet_local # TCP/IP 24LDADD+= -lrumpnet_netinet -lrumpnet_net -lrumpnet_local # TCP/IP
25LDADD+= -lrumpnet_shmif # shmif 25LDADD+= -lrumpnet_shmif # shmif
26LDADD+= -lrumpnet -lrumpkern_sysproxy -lrump -lrumpuser # base 26LDADD+= -lrumpnet -lrumpkern_sysproxy -lrump -lrumpuser # base
27LDADD+= -lpthread -lutil 27LDADD+= -lpthread -lutil
28 28
29CPPFLAGS+= -DDEBUG -DMOUNT_NOMAIN -D_REENTRANT 29CPPFLAGS+= -DDEBUG -DMOUNT_NOMAIN -D_REENTRANT
30CPPFLAGS+= -DRUMP_SYS_NETWORKING 30CPPFLAGS+= -DRUMP_SYS_NETWORKING -DMOUNTD_RUMP
31 31
32.PATH: ${.CURDIR}/rpcbind 32.PATH.c: ${NETBSDSRCDIR}/usr.sbin/mountd
33.include "rpcbind/Makefile.inc" 
34 33
35WARNS= 2 34# RPCBIND
 35.PATH.c: ${NETBSDSRCDIR}/usr.sbin/rpcbind
 36SRCS.rumpnfsd+= check_bound.c rpcb_stat.c rpcb_svc_4.c rpcbind.c pmap_svc.c \
 37 rpcb_svc.c rpcb_svc_com.c security.c util.c
 38
 39LIBRPCDIR= ${NETBSDSRCDIR}/lib/libc/rpc
 40
 41CPPFLAGS+= -I${LIBRPCDIR} -DPORTMAP -DLIBWRAP -DRPCBIND_RUMP
 42
 43# Uncomment these to get any useful output from 'rpcbind -d'
 44# CPPFLAGS+= -DRPCBIND_DEBUG
 45# CPPFLAGS+= -DSVC_RUN_DEBUG
 46
 47LDADD+= -lwrap -lutil
 48DPADD+= ${LIBWRAP} ${LIBUTIL}
36 49
37.include <bsd.test.mk> 50.include <bsd.test.mk>

File Deleted: src/tests/fs/nfs/nfsservice/Attic/mountd.c

File Deleted: src/tests/fs/nfs/nfsservice/rpcbind/Attic/Makefile.inc