[src/trunk]: src/usr.sbin/puffs Define concept "disk based file system" and f...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5f547235a6ee
branches:  trunk
changeset: 751126:5f547235a6ee
user:      pooka <pooka%NetBSD.org@localhost>
date:      Mon Jan 25 15:55:36 2010 +0000

description:
Define concept "disk based file system" and flag appropriate file
systems as such.

diffstat:

 usr.sbin/puffs/Makefile.inc         |  7 ++++++-
 usr.sbin/puffs/rump_cd9660/Makefile |  3 ++-
 usr.sbin/puffs/rump_efs/Makefile    |  3 ++-
 usr.sbin/puffs/rump_ext2fs/Makefile |  3 ++-
 usr.sbin/puffs/rump_ffs/Makefile    |  3 ++-
 usr.sbin/puffs/rump_hfs/Makefile    |  3 ++-
 usr.sbin/puffs/rump_lfs/Makefile    |  3 ++-
 usr.sbin/puffs/rump_msdos/Makefile  |  3 ++-
 usr.sbin/puffs/rump_ntfs/Makefile   |  3 ++-
 usr.sbin/puffs/rump_udf/Makefile    |  3 ++-
 10 files changed, 24 insertions(+), 10 deletions(-)

diffs (154 lines):

diff -r d78d982420a8 -r 5f547235a6ee usr.sbin/puffs/Makefile.inc
--- a/usr.sbin/puffs/Makefile.inc       Mon Jan 25 15:30:44 2010 +0000
+++ b/usr.sbin/puffs/Makefile.inc       Mon Jan 25 15:55:36 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.12 2009/11/05 11:41:43 pooka Exp $
+#      $NetBSD: Makefile.inc,v 1.13 2010/01/25 15:55:36 pooka Exp $
 
 WARNS?=        4
 
@@ -38,6 +38,11 @@
 .PATH:         ${MOUNT} ${MOUNTDIR}/mount_${MOUNTNAME}
 .endif # MOUNTNAME
 
+# disk components for disk-based file systems
+.if RUMP_DISKFS
+LDADD+=                -lrumpdev_disk -lrumpdev
+.endif
+
 LDADD+=                -lp2k -lukfs -lrumpvfs -lrump -lrumpuser -lpuffs -lutil
 LDADD+=                -lpthread
 
diff -r d78d982420a8 -r 5f547235a6ee usr.sbin/puffs/rump_cd9660/Makefile
--- a/usr.sbin/puffs/rump_cd9660/Makefile       Mon Jan 25 15:30:44 2010 +0000
+++ b/usr.sbin/puffs/rump_cd9660/Makefile       Mon Jan 25 15:55:36 2010 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.2 2008/08/05 20:57:45 pooka Exp $
+#      $NetBSD: Makefile,v 1.3 2010/01/25 15:55:36 pooka Exp $
 #
 
 MOUNTNAME=     cd9660
 
 ISRUMP=                # yes
+RUMP_DISKFS=
 
 .include <bsd.prog.mk>
diff -r d78d982420a8 -r 5f547235a6ee usr.sbin/puffs/rump_efs/Makefile
--- a/usr.sbin/puffs/rump_efs/Makefile  Mon Jan 25 15:30:44 2010 +0000
+++ b/usr.sbin/puffs/rump_efs/Makefile  Mon Jan 25 15:55:36 2010 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.2 2008/08/05 20:57:45 pooka Exp $
+#      $NetBSD: Makefile,v 1.3 2010/01/25 15:55:36 pooka Exp $
 #
 
 MOUNTNAME=     efs
 
 ISRUMP=                # gracie, padre
+RUMP_DISKFS=
 
 .include <bsd.prog.mk>
diff -r d78d982420a8 -r 5f547235a6ee usr.sbin/puffs/rump_ext2fs/Makefile
--- a/usr.sbin/puffs/rump_ext2fs/Makefile       Mon Jan 25 15:30:44 2010 +0000
+++ b/usr.sbin/puffs/rump_ext2fs/Makefile       Mon Jan 25 15:55:36 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2009/05/02 01:15:53 pooka Exp $
+#      $NetBSD: Makefile,v 1.6 2010/01/25 15:55:36 pooka Exp $
 #
 
 .include <bsd.own.mk>
@@ -9,5 +9,6 @@
 DPADD+=                ${LIBRUMPFS_FFS}
 
 ISRUMP=                # yea baby
+RUMP_DISKFS=
 
 .include <bsd.prog.mk>
diff -r d78d982420a8 -r 5f547235a6ee usr.sbin/puffs/rump_ffs/Makefile
--- a/usr.sbin/puffs/rump_ffs/Makefile  Mon Jan 25 15:30:44 2010 +0000
+++ b/usr.sbin/puffs/rump_ffs/Makefile  Mon Jan 25 15:55:36 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2009/05/02 01:15:53 pooka Exp $
+#      $NetBSD: Makefile,v 1.5 2010/01/25 15:55:36 pooka Exp $
 #
 
 .include <bsd.own.mk>
@@ -6,5 +6,6 @@
 MOUNTNAME=     ffs
 
 ISRUMP=                # affirmative
+RUMP_DISKFS=
 
 .include <bsd.prog.mk>
diff -r d78d982420a8 -r 5f547235a6ee usr.sbin/puffs/rump_hfs/Makefile
--- a/usr.sbin/puffs/rump_hfs/Makefile  Mon Jan 25 15:30:44 2010 +0000
+++ b/usr.sbin/puffs/rump_hfs/Makefile  Mon Jan 25 15:55:36 2010 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.3 2009/12/03 14:26:44 pooka Exp $
+#      $NetBSD: Makefile,v 1.4 2010/01/25 15:55:36 pooka Exp $
 #
 
 MOUNTNAME=     hfs
 
 ISRUMP=                # rump roast
+RUMP_DISKFS=
 
 .include <bsd.prog.mk>
diff -r d78d982420a8 -r 5f547235a6ee usr.sbin/puffs/rump_lfs/Makefile
--- a/usr.sbin/puffs/rump_lfs/Makefile  Mon Jan 25 15:30:44 2010 +0000
+++ b/usr.sbin/puffs/rump_lfs/Makefile  Mon Jan 25 15:55:36 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2009/11/05 14:17:07 pooka Exp $
+#      $NetBSD: Makefile,v 1.8 2010/01/25 15:55:36 pooka Exp $
 #
 
 .include <bsd.own.mk>
@@ -9,6 +9,7 @@
 DPADD+=                ${LIBRUMPFS_FFS}
 
 ISRUMP=                # don't deny it
+RUMP_DISKFS=
 
 CPPFLAGS+=     -DUSE_RUMP -DLFS_CLEANER_AS_LIB
 
diff -r d78d982420a8 -r 5f547235a6ee usr.sbin/puffs/rump_msdos/Makefile
--- a/usr.sbin/puffs/rump_msdos/Makefile        Mon Jan 25 15:30:44 2010 +0000
+++ b/usr.sbin/puffs/rump_msdos/Makefile        Mon Jan 25 15:55:36 2010 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.3 2008/08/05 20:57:46 pooka Exp $
+#      $NetBSD: Makefile,v 1.4 2010/01/25 15:55:36 pooka Exp $
 #
 
 MOUNTNAME=     msdos
 
 ISRUMP=                # rump, si
+RUMP_DISKFS=   # si2
 
 .include <bsd.prog.mk>
diff -r d78d982420a8 -r 5f547235a6ee usr.sbin/puffs/rump_ntfs/Makefile
--- a/usr.sbin/puffs/rump_ntfs/Makefile Mon Jan 25 15:30:44 2010 +0000
+++ b/usr.sbin/puffs/rump_ntfs/Makefile Mon Jan 25 15:55:36 2010 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.2 2008/08/05 20:57:46 pooka Exp $
+#      $NetBSD: Makefile,v 1.3 2010/01/25 15:55:37 pooka Exp $
 #
 
 MOUNTNAME=     ntfs
 
 ISRUMP=                # only for you sir, only for you
+RUMP_DISKFS=
 
 .include <bsd.prog.mk>
diff -r d78d982420a8 -r 5f547235a6ee usr.sbin/puffs/rump_udf/Makefile
--- a/usr.sbin/puffs/rump_udf/Makefile  Mon Jan 25 15:30:44 2010 +0000
+++ b/usr.sbin/puffs/rump_udf/Makefile  Mon Jan 25 15:55:36 2010 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.2 2008/08/05 20:57:46 pooka Exp $
+#      $NetBSD: Makefile,v 1.3 2010/01/25 15:55:37 pooka Exp $
 #
 
 MOUNTNAME=     udf
 
 ISRUMP=                # more cowbell
+RUMP_DISKFS=
 
 .include <bsd.prog.mk>