Tue Dec 30 22:20:56 2008 UTC ()
Link self-contained file systems (i.e. do not depend on other file
systems) against the kernel module on select archs.
(pooka)
diff -r1.6 -r1.7 src/usr.sbin/puffs/Makefile.inc
diff -r1.3 -r1.4 src/usr.sbin/puffs/rump_ext2fs/Makefile
diff -r1.2 -r1.3 src/usr.sbin/puffs/rump_ffs/Makefile
diff -r1.2 -r1.3 src/usr.sbin/puffs/rump_lfs/Makefile
diff -r1.1 -r1.2 src/usr.sbin/puffs/rump_nfs/Makefile
diff -r1.1 -r1.2 src/usr.sbin/puffs/rump_sysvbfs/Makefile
--- src/usr.sbin/puffs/Makefile.inc 2008/11/19 14:10:49 1.6
+++ src/usr.sbin/puffs/Makefile.inc 2008/12/30 22:20:56 1.7
@@ -1,5 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.6 2008/11/19 14:10:49 pooka Exp $
+# $NetBSD: Makefile.inc,v 1.7 2008/12/30 22:20:56 pooka Exp $
+.include <bsd.own.mk>
+.include <bsd.sys.mk>
+
USE_FORT?= yes # network client
.if exists(${.CURDIR}/../../Makefile.inc)
@@ -17,7 +20,16 @@
CPPFLAGS+= -I${MOUNTDIR}/mount_${MOUNTNAME} -I${MOUNT} -DMOUNT_NOMAIN
SRCS+= mount_${MOUNTNAME}.c rump_${MOUNTNAME}.c pathadj.c fattr.c
+# on select archs use the kernel module directly, otherwise fallback
+# to the rump library
+.ifdef(RUMPKMOD)
+OSRELEASE!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
+KMODULEDIR= ${DESTDIR}/stand/${MACHINE}/${OSRELEASE}/modules/${MOUNTNAME}
+LDADD+= ${KMODULEDIR}/${MOUNTNAME}.kmod
+.else
LDADD+= -lrumpfs_${MOUNTNAME}
+.endif
+
.PATH: ${MOUNT} ${MOUNTDIR}/mount_${MOUNTNAME}
.endif # MOUNTNAME
--- src/usr.sbin/puffs/rump_ext2fs/Makefile 2008/11/26 19:41:11 1.3
+++ src/usr.sbin/puffs/rump_ext2fs/Makefile 2008/12/30 22:20:56 1.4
@@ -1,5 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2008/11/26 19:41:11 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2008/12/30 22:20:56 pooka Exp $
#
+
+.include <bsd.own.mk>
+.undef RUMPKMOD
MOUNTNAME= ext2fs
--- src/usr.sbin/puffs/rump_ffs/Makefile 2008/08/05 20:57:46 1.2
+++ src/usr.sbin/puffs/rump_ffs/Makefile 2008/12/30 22:20:56 1.3
@@ -1,5 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2008/08/05 20:57:46 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2008/12/30 22:20:56 pooka Exp $
#
+
+.include <bsd.own.mk>
+.undef RUMPKMOD
MOUNTNAME= ffs
--- src/usr.sbin/puffs/rump_lfs/Makefile 2008/08/05 20:57:46 1.2
+++ src/usr.sbin/puffs/rump_lfs/Makefile 2008/12/30 22:20:56 1.3
@@ -1,5 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2008/08/05 20:57:46 pooka Exp $
+# $NetBSD: Makefile,v 1.3 2008/12/30 22:20:56 pooka Exp $
#
+
+.include <bsd.own.mk>
+.undef RUMPKMOD
MOUNTNAME= lfs
--- src/usr.sbin/puffs/rump_nfs/Makefile 2008/10/16 09:30:57 1.1
+++ src/usr.sbin/puffs/rump_nfs/Makefile 2008/12/30 22:20:56 1.2
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2008/10/16 09:30:57 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2008/12/30 22:20:56 pooka Exp $
#
+.include <bsd.own.mk>
+
MOUNTNAME= nfs
SRCS+= getnfsargs.c
@@ -10,7 +12,11 @@
# second one runs the real NetBSD kernel networking stack in userspace
# and uses /dev/tap to access the network.
#
+.ifdef(RUMPKMOD)
+LDADD+= -lrumpnet -lrumpnet_sockin
+.else
LDADD+= -lrumpfs_nfs -lrumpnet -lrumpnet_sockin
+.endif
#LDADD+= -lrumpfs_nfs -lrumpnet -lrumpnet_net -lrumpnet_netinet \
-lrumpnet_virtif
--- src/usr.sbin/puffs/rump_sysvbfs/Makefile 2008/09/04 12:21:25 1.1
+++ src/usr.sbin/puffs/rump_sysvbfs/Makefile 2008/12/30 22:20:56 1.2
@@ -1,5 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2008/09/04 12:21:25 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2008/12/30 22:20:56 pooka Exp $
#
+
+.include <bsd.own.mk>
+.undef RUMPKMOD
MOUNTNAME= sysvbfs