Module Name:    src
Committed By:   bouyer
Date:           Sun Mar  6 18:15:31 UTC 2011

Modified Files:
        src/tools/installboot: Makefile
        src/tools/makefs: Makefile

Log Message:
merge the bouyer-quota2 branch. This adds a new on-disk format
to store disk quota usage and limits, integrated with ffs
metadata. Usage is checked by fsck_ffs (no more quotacheck)
and is covered by the WAPBL journal. Enabled with kernel
option QUOTA2 (added where QUOTA was enabled in kernel config files),
turned on with tunefs(8) on a per-filesystem
basis. mount_mfs(8) can also turn quotas on.

See http://mail-index.netbsd.org/tech-kern/2011/02/19/msg010025.html
for details.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/tools/installboot/Makefile
cvs rdiff -u -r1.7 -r1.8 src/tools/makefs/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tools/installboot/Makefile
diff -u src/tools/installboot/Makefile:1.10 src/tools/installboot/Makefile:1.11
--- src/tools/installboot/Makefile:1.10	Sat Jun 19 23:11:10 2010
+++ src/tools/installboot/Makefile	Sun Mar  6 18:15:30 2011
@@ -1,9 +1,10 @@
-#	$NetBSD: Makefile,v 1.10 2010/06/19 23:11:10 riz Exp $
+#	$NetBSD: Makefile,v 1.11 2011/03/06 18:15:30 bouyer Exp $
 
 HOSTPROGNAME=	${_TOOL_PREFIX}installboot
 HOST_SRCDIR=	usr.sbin/installboot
 
 HOST_CPPFLAGS+=	-I. -I${.CURDIR} -I${.CURDIR}/../mips-elf2ecoff
+HOST_CPPFLAGS+=	-I${TOOLDIR}/include/nbinclude
 
 .include "${.CURDIR}/../Makefile.nbincludes"
 .include "${.CURDIR}/../Makefile.host"

Index: src/tools/makefs/Makefile
diff -u src/tools/makefs/Makefile:1.7 src/tools/makefs/Makefile:1.8
--- src/tools/makefs/Makefile:1.7	Wed May 14 00:30:27 2003
+++ src/tools/makefs/Makefile	Sun Mar  6 18:15:30 2011
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.7 2003/05/14 00:30:27 dbj Exp $
+#	$NetBSD: Makefile,v 1.8 2011/03/06 18:15:30 bouyer Exp $
 
 HOSTPROGNAME=	${_TOOL_PREFIX}makefs
 HOST_SRCDIR=	usr.sbin/makefs
 
-HOST_CPPFLAGS+=	-I.
+HOST_CPPFLAGS+=	-I. -I${TOOLDIR}/include/nbinclude
 
 .include "${.CURDIR}/../Makefile.host"
 

Reply via email to