From 26994c608bad4f20fc7d5c8fc968d847b8cca107 Mon Sep 17 00:00:00 2001 From: pooka Date: Mon, 25 Jan 2010 15:55:36 +0000 Subject: [PATCH] Define concept "disk based file system" and flag appropriate file systems as such. --- 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(-) diff --git a/usr.sbin/puffs/Makefile.inc b/usr.sbin/puffs/Makefile.inc index a41fc9f0c00d..72a290fe7879 100644 --- a/usr.sbin/puffs/Makefile.inc +++ b/usr.sbin/puffs/Makefile.inc @@ -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 @@ LDADD+= -lrumpfs_${MOUNTNAME} .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 --git a/usr.sbin/puffs/rump_cd9660/Makefile b/usr.sbin/puffs/rump_cd9660/Makefile index 82045ff08108..e6229806071f 100644 --- a/usr.sbin/puffs/rump_cd9660/Makefile +++ b/usr.sbin/puffs/rump_cd9660/Makefile @@ -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 diff --git a/usr.sbin/puffs/rump_efs/Makefile b/usr.sbin/puffs/rump_efs/Makefile index b0b327adbcc3..8deb021ed2a4 100644 --- a/usr.sbin/puffs/rump_efs/Makefile +++ b/usr.sbin/puffs/rump_efs/Makefile @@ -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 diff --git a/usr.sbin/puffs/rump_ext2fs/Makefile b/usr.sbin/puffs/rump_ext2fs/Makefile index 71d255ee1436..a758cde5264c 100644 --- a/usr.sbin/puffs/rump_ext2fs/Makefile +++ b/usr.sbin/puffs/rump_ext2fs/Makefile @@ -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 @@ -9,5 +9,6 @@ LDADD+= -lrumpfs_ffs DPADD+= ${LIBRUMPFS_FFS} ISRUMP= # yea baby +RUMP_DISKFS= .include diff --git a/usr.sbin/puffs/rump_ffs/Makefile b/usr.sbin/puffs/rump_ffs/Makefile index 59a4c4a5113f..c565e1598cf4 100644 --- a/usr.sbin/puffs/rump_ffs/Makefile +++ b/usr.sbin/puffs/rump_ffs/Makefile @@ -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 @@ -6,5 +6,6 @@ MOUNTNAME= ffs ISRUMP= # affirmative +RUMP_DISKFS= .include diff --git a/usr.sbin/puffs/rump_hfs/Makefile b/usr.sbin/puffs/rump_hfs/Makefile index 287ebe3444a5..687e5b7dc704 100644 --- a/usr.sbin/puffs/rump_hfs/Makefile +++ b/usr.sbin/puffs/rump_hfs/Makefile @@ -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 diff --git a/usr.sbin/puffs/rump_lfs/Makefile b/usr.sbin/puffs/rump_lfs/Makefile index cb6c6fb7985f..9d7c564e0d99 100644 --- a/usr.sbin/puffs/rump_lfs/Makefile +++ b/usr.sbin/puffs/rump_lfs/Makefile @@ -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 @@ -9,6 +9,7 @@ LDADD+= -lrumpfs_ffs DPADD+= ${LIBRUMPFS_FFS} ISRUMP= # don't deny it +RUMP_DISKFS= CPPFLAGS+= -DUSE_RUMP -DLFS_CLEANER_AS_LIB diff --git a/usr.sbin/puffs/rump_msdos/Makefile b/usr.sbin/puffs/rump_msdos/Makefile index dfc8c9347266..457b8bd3d3e0 100644 --- a/usr.sbin/puffs/rump_msdos/Makefile +++ b/usr.sbin/puffs/rump_msdos/Makefile @@ -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 diff --git a/usr.sbin/puffs/rump_ntfs/Makefile b/usr.sbin/puffs/rump_ntfs/Makefile index 91013bb7317c..70751a3d81bb 100644 --- a/usr.sbin/puffs/rump_ntfs/Makefile +++ b/usr.sbin/puffs/rump_ntfs/Makefile @@ -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 diff --git a/usr.sbin/puffs/rump_udf/Makefile b/usr.sbin/puffs/rump_udf/Makefile index 499aab2bbd18..c50e340cb10d 100644 --- a/usr.sbin/puffs/rump_udf/Makefile +++ b/usr.sbin/puffs/rump_udf/Makefile @@ -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