Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Some of the puffs mount programs don't need RUMP, re-enable ...
details: https://anonhg.NetBSD.org/src/rev/4a0690da22f8
branches: trunk
changeset: 811641:4a0690da22f8
user: christos <christos%NetBSD.org@localhost>
date: Sun Nov 08 20:00:22 2015 +0000
description:
Some of the puffs mount programs don't need RUMP, re-enable them.
diffstat:
distrib/sets/lists/base/mi | 8 ++++----
distrib/sets/lists/debug/mi | 8 ++++----
distrib/sets/lists/man/mi | 16 ++++++++--------
usr.sbin/Makefile | 8 ++------
usr.sbin/puffs/Makefile | 5 ++++-
usr.sbin/puffs/mount_sysctlfs/Makefile | 6 +++++-
6 files changed, 27 insertions(+), 24 deletions(-)
diffs (184 lines):
diff -r 10c74e30b9b9 -r 4a0690da22f8 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi Sun Nov 08 19:40:06 2015 +0000
+++ b/distrib/sets/lists/base/mi Sun Nov 08 20:00:22 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1115 2015/10/09 19:23:18 riz Exp $
+# $NetBSD: mi,v 1.1116 2015/11/08 20:00:22 christos Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1719,10 +1719,10 @@
./usr/sbin/mopd base-bootserver-bin
./usr/sbin/mopprobe base-bootserver-bin
./usr/sbin/moptrace base-bootserver-bin
-./usr/sbin/mount_9p base-puffs-bin rump
-./usr/sbin/mount_psshfs base-puffs-bin rump
+./usr/sbin/mount_9p base-puffs-bin
+./usr/sbin/mount_psshfs base-puffs-bin
./usr/sbin/mount_puffsportal base-obsolete obsolete
-./usr/sbin/mount_sysctlfs base-puffs-bin rump
+./usr/sbin/mount_sysctlfs base-puffs-bin
./usr/sbin/mountd base-nfsserver-bin
./usr/sbin/moused base-sysutil-bin
./usr/sbin/mrinfo base-router-bin
diff -r 10c74e30b9b9 -r 4a0690da22f8 distrib/sets/lists/debug/mi
--- a/distrib/sets/lists/debug/mi Sun Nov 08 19:40:06 2015 +0000
+++ b/distrib/sets/lists/debug/mi Sun Nov 08 20:00:22 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.132 2015/11/04 23:57:06 knakahara Exp $
+# $NetBSD: mi,v 1.133 2015/11/08 20:00:22 christos Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -1114,10 +1114,10 @@
./usr/libdata/debug/usr/sbin/mopd.debug comp-bootserver-debug debug
./usr/libdata/debug/usr/sbin/mopprobe.debug comp-bootserver-debug debug
./usr/libdata/debug/usr/sbin/moptrace.debug comp-bootserver-debug debug
-./usr/libdata/debug/usr/sbin/mount_9p.debug comp-puffs-debug debug,rump
-./usr/libdata/debug/usr/sbin/mount_psshfs.debug comp-puffs-debug debug,rump
+./usr/libdata/debug/usr/sbin/mount_9p.debug comp-puffs-debug debug
+./usr/libdata/debug/usr/sbin/mount_psshfs.debug comp-puffs-debug debug
./usr/libdata/debug/usr/sbin/mount_puffsportal.debug comp-obsolete obsolete
-./usr/libdata/debug/usr/sbin/mount_sysctlfs.debug comp-puffs-debug debug,rump
+./usr/libdata/debug/usr/sbin/mount_sysctlfs.debug comp-puffs-debug debug
./usr/libdata/debug/usr/sbin/mountd.debug comp-nfsserver-debug debug
./usr/libdata/debug/usr/sbin/moused.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/sbin/mrinfo.debug comp-router-debug debug
diff -r 10c74e30b9b9 -r 4a0690da22f8 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Sun Nov 08 19:40:06 2015 +0000
+++ b/distrib/sets/lists/man/mi Sun Nov 08 20:00:22 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1511 2015/10/14 04:22:45 nonaka Exp $
+# $NetBSD: mi,v 1.1512 2015/11/08 20:00:22 christos Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2669,7 +2669,7 @@
./usr/share/man/cat8/modunload.0 man-sysutil-catman .cat
./usr/share/man/cat8/mopd.0 man-bootserver-catman .cat
./usr/share/man/cat8/mount.0 man-sysutil-catman .cat
-./usr/share/man/cat8/mount_9p.0 man-puffs-catman .cat,rump
+./usr/share/man/cat8/mount_9p.0 man-puffs-catman .cat
./usr/share/man/cat8/mount_ados.0 man-adosfs-catman .cat
./usr/share/man/cat8/mount_cd9660.0 man-sysutil-catman .cat
./usr/share/man/cat8/mount_chfs.0 man-sysutil-catman .cat
@@ -2691,11 +2691,11 @@
./usr/share/man/cat8/mount_overlay.0 man-miscfs-catman .cat
./usr/share/man/cat8/mount_portal.0 man-miscfs-catman .cat
./usr/share/man/cat8/mount_procfs.0 man-sysutil-catman .cat
-./usr/share/man/cat8/mount_psshfs.0 man-puffs-catman .cat,rump
+./usr/share/man/cat8/mount_psshfs.0 man-puffs-catman .cat
./usr/share/man/cat8/mount_ptyfs.0 man-sysutil-catman .cat
./usr/share/man/cat8/mount_puffs.0 man-sysutil-catman .cat
./usr/share/man/cat8/mount_smbfs.0 man-smbfs-catman .cat
-./usr/share/man/cat8/mount_sysctlfs.0 man-puffs-catman .cat,rump
+./usr/share/man/cat8/mount_sysctlfs.0 man-puffs-catman .cat
./usr/share/man/cat8/mount_sysvbfs.0 man-sysutil-catman .cat
./usr/share/man/cat8/mount_tmpfs.0 man-sysutil-catman .cat
./usr/share/man/cat8/mount_udf.0 man-sysutil-catman .cat
@@ -5533,7 +5533,7 @@
./usr/share/man/html8/modunload.html man-sysutil-htmlman html
./usr/share/man/html8/mopd.html man-bootserver-htmlman html
./usr/share/man/html8/mount.html man-sysutil-htmlman html
-./usr/share/man/html8/mount_9p.html man-puffs-htmlman html,rump
+./usr/share/man/html8/mount_9p.html man-puffs-htmlman html
./usr/share/man/html8/mount_ados.html man-adosfs-htmlman html
./usr/share/man/html8/mount_cd9660.html man-sysutil-htmlman html
./usr/share/man/html8/mount_chfs.html man-sysutil-htmlman html
@@ -8577,7 +8577,7 @@
./usr/share/man/man8/modunload.8 man-sysutil-man .man
./usr/share/man/man8/mopd.8 man-bootserver-man .man
./usr/share/man/man8/mount.8 man-sysutil-man .man
-./usr/share/man/man8/mount_9p.8 man-puffs-man .man,rump
+./usr/share/man/man8/mount_9p.8 man-puffs-man .man
./usr/share/man/man8/mount_ados.8 man-adosfs-man .man
./usr/share/man/man8/mount_cd9660.8 man-sysutil-man .man
./usr/share/man/man8/mount_chfs.8 man-sysutil-man .man
@@ -8599,11 +8599,11 @@
./usr/share/man/man8/mount_overlay.8 man-miscfs-man .man
./usr/share/man/man8/mount_portal.8 man-miscfs-man .man
./usr/share/man/man8/mount_procfs.8 man-sysutil-man .man
-./usr/share/man/man8/mount_psshfs.8 man-puffs-man .man,rump
+./usr/share/man/man8/mount_psshfs.8 man-puffs-man .man
./usr/share/man/man8/mount_ptyfs.8 man-sysutil-man .man
./usr/share/man/man8/mount_puffs.8 man-sysutil-man .man
./usr/share/man/man8/mount_smbfs.8 man-smbfs-man .man
-./usr/share/man/man8/mount_sysctlfs.8 man-puffs-man .man,rump
+./usr/share/man/man8/mount_sysctlfs.8 man-puffs-man .man
./usr/share/man/man8/mount_sysvbfs.8 man-sysutil-man .man
./usr/share/man/man8/mount_tmpfs.8 man-sysutil-man .man
./usr/share/man/man8/mount_udf.8 man-sysutil-man .man
diff -r 10c74e30b9b9 -r 4a0690da22f8 usr.sbin/Makefile
--- a/usr.sbin/Makefile Sun Nov 08 19:40:06 2015 +0000
+++ b/usr.sbin/Makefile Sun Nov 08 20:00:22 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.271 2015/08/17 06:42:46 knakahara Exp $
+# $NetBSD: Makefile,v 1.272 2015/11/08 20:00:22 christos Exp $
# from: @(#)Makefile 5.20 (Berkeley) 6/12/93
.include <bsd.own.mk>
@@ -20,7 +20,7 @@
ndbootd ndiscvt netgroup_mkdb nfsd \
ofctl \
paxctl pcictl perfused psrset pstat pwd_mkdb postinstall \
- powerd \
+ powerd puffs \
quot quotacheck quotaon quotarestore \
rarpd rbootd rdate repquota rmt rpc.bootparamd rpc.lockd \
rpc.pcnfsd rpc.statd rpcbind rwhod \
@@ -41,10 +41,6 @@
SUBDIR+= rpc.yppasswdd ypbind yppoll ypserv ypset
.endif
-.if (${MKRUMP} != "no")
-SUBDIR+= puffs
-.endif
-
.if ${TOOLCHAIN_MISSING} != "no"
SUBDIR+= mdsetimage
.endif
diff -r 10c74e30b9b9 -r 4a0690da22f8 usr.sbin/puffs/Makefile
--- a/usr.sbin/puffs/Makefile Sun Nov 08 19:40:06 2015 +0000
+++ b/usr.sbin/puffs/Makefile Sun Nov 08 20:00:22 2015 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2011/07/24 08:55:30 uch Exp $
+# $NetBSD: Makefile,v 1.17 2015/11/08 20:00:22 christos Exp $
.include <bsd.own.mk>
SUBDIR= mount_9p mount_psshfs mount_sysctlfs
+.if (${MKRUMP} != "no")
SUBDIR+=rump_cd9660 rump_efs rump_ext2fs rump_ffs rump_hfs rump_lfs
SUBDIR+=rump_msdos rump_nfs rump_ntfs rump_syspuffs rump_sysvbfs
SUBDIR+=rump_tmpfs rump_udf rump_v7fs
@@ -30,4 +31,6 @@
# mostly for debugging.
#SUBDIR+=rump_au-naturel
+.endif
+
.include <bsd.subdir.mk>
diff -r 10c74e30b9b9 -r 4a0690da22f8 usr.sbin/puffs/mount_sysctlfs/Makefile
--- a/usr.sbin/puffs/mount_sysctlfs/Makefile Sun Nov 08 19:40:06 2015 +0000
+++ b/usr.sbin/puffs/mount_sysctlfs/Makefile Sun Nov 08 20:00:22 2015 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2010/08/06 15:04:13 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2015/11/08 20:00:22 christos Exp $
+
+.include <bsd.own.mk>
PROG= mount_sysctlfs
SRCS= sysctlfs.c
@@ -8,9 +10,11 @@
MAN= mount_sysctlfs.8
+.if (${MKRUMP} != "no")
.ifdef RUMP_ACTION
CPPFLAGS+= -DRUMP_ACTION
LDADD+= -lrump -lrumpuser -lpthread
.endif
+.endif
.include <bsd.prog.mk>
Home |
Main Index |
Thread Index |
Old Index