Module Name: src
Committed By: pooka
Date: Mon Jan 25 15:55:37 UTC 2010
Modified Files:
src/usr.sbin/puffs: Makefile.inc
src/usr.sbin/puffs/rump_cd9660: Makefile
src/usr.sbin/puffs/rump_efs: Makefile
src/usr.sbin/puffs/rump_ext2fs: Makefile
src/usr.sbin/puffs/rump_ffs: Makefile
src/usr.sbin/puffs/rump_hfs: Makefile
src/usr.sbin/puffs/rump_lfs: Makefile
src/usr.sbin/puffs/rump_msdos: Makefile
src/usr.sbin/puffs/rump_ntfs: Makefile
src/usr.sbin/puffs/rump_udf: Makefile
Log Message:
Define concept "disk based file system" and flag appropriate file
systems as such.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/puffs/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/puffs/rump_cd9660/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/puffs/rump_efs/Makefile
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/puffs/rump_ext2fs/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/puffs/rump_ffs/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/puffs/rump_hfs/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/puffs/rump_lfs/Makefile
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/puffs/rump_msdos/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/puffs/rump_ntfs/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/puffs/rump_udf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/puffs/Makefile.inc
diff -u src/usr.sbin/puffs/Makefile.inc:1.12 src/usr.sbin/puffs/Makefile.inc:1.13
--- src/usr.sbin/puffs/Makefile.inc:1.12 Thu Nov 5 11:41:43 2009
+++ src/usr.sbin/puffs/Makefile.inc Mon Jan 25 15:55:36 2010
@@ -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
Index: src/usr.sbin/puffs/rump_cd9660/Makefile
diff -u src/usr.sbin/puffs/rump_cd9660/Makefile:1.2 src/usr.sbin/puffs/rump_cd9660/Makefile:1.3
--- src/usr.sbin/puffs/rump_cd9660/Makefile:1.2 Tue Aug 5 20:57:45 2008
+++ src/usr.sbin/puffs/rump_cd9660/Makefile Mon Jan 25 15:55:36 2010
@@ -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>
Index: src/usr.sbin/puffs/rump_efs/Makefile
diff -u src/usr.sbin/puffs/rump_efs/Makefile:1.2 src/usr.sbin/puffs/rump_efs/Makefile:1.3
--- src/usr.sbin/puffs/rump_efs/Makefile:1.2 Tue Aug 5 20:57:45 2008
+++ src/usr.sbin/puffs/rump_efs/Makefile Mon Jan 25 15:55:36 2010
@@ -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>
Index: src/usr.sbin/puffs/rump_ext2fs/Makefile
diff -u src/usr.sbin/puffs/rump_ext2fs/Makefile:1.5 src/usr.sbin/puffs/rump_ext2fs/Makefile:1.6
--- src/usr.sbin/puffs/rump_ext2fs/Makefile:1.5 Sat May 2 01:15:53 2009
+++ src/usr.sbin/puffs/rump_ext2fs/Makefile Mon Jan 25 15:55:36 2010
@@ -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>
Index: src/usr.sbin/puffs/rump_ffs/Makefile
diff -u src/usr.sbin/puffs/rump_ffs/Makefile:1.4 src/usr.sbin/puffs/rump_ffs/Makefile:1.5
--- src/usr.sbin/puffs/rump_ffs/Makefile:1.4 Sat May 2 01:15:53 2009
+++ src/usr.sbin/puffs/rump_ffs/Makefile Mon Jan 25 15:55:36 2010
@@ -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>
Index: src/usr.sbin/puffs/rump_hfs/Makefile
diff -u src/usr.sbin/puffs/rump_hfs/Makefile:1.3 src/usr.sbin/puffs/rump_hfs/Makefile:1.4
--- src/usr.sbin/puffs/rump_hfs/Makefile:1.3 Thu Dec 3 14:26:44 2009
+++ src/usr.sbin/puffs/rump_hfs/Makefile Mon Jan 25 15:55:36 2010
@@ -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>
Index: src/usr.sbin/puffs/rump_lfs/Makefile
diff -u src/usr.sbin/puffs/rump_lfs/Makefile:1.7 src/usr.sbin/puffs/rump_lfs/Makefile:1.8
--- src/usr.sbin/puffs/rump_lfs/Makefile:1.7 Thu Nov 5 14:17:07 2009
+++ src/usr.sbin/puffs/rump_lfs/Makefile Mon Jan 25 15:55:36 2010
@@ -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
Index: src/usr.sbin/puffs/rump_msdos/Makefile
diff -u src/usr.sbin/puffs/rump_msdos/Makefile:1.3 src/usr.sbin/puffs/rump_msdos/Makefile:1.4
--- src/usr.sbin/puffs/rump_msdos/Makefile:1.3 Tue Aug 5 20:57:46 2008
+++ src/usr.sbin/puffs/rump_msdos/Makefile Mon Jan 25 15:55:36 2010
@@ -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>
Index: src/usr.sbin/puffs/rump_ntfs/Makefile
diff -u src/usr.sbin/puffs/rump_ntfs/Makefile:1.2 src/usr.sbin/puffs/rump_ntfs/Makefile:1.3
--- src/usr.sbin/puffs/rump_ntfs/Makefile:1.2 Tue Aug 5 20:57:46 2008
+++ src/usr.sbin/puffs/rump_ntfs/Makefile Mon Jan 25 15:55:37 2010
@@ -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>
Index: src/usr.sbin/puffs/rump_udf/Makefile
diff -u src/usr.sbin/puffs/rump_udf/Makefile:1.2 src/usr.sbin/puffs/rump_udf/Makefile:1.3
--- src/usr.sbin/puffs/rump_udf/Makefile:1.2 Tue Aug 5 20:57:46 2008
+++ src/usr.sbin/puffs/rump_udf/Makefile Mon Jan 25 15:55:37 2010
@@ -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>
