Module Name: src
Committed By: dholland
Date: Sat Jun 8 21:13:19 UTC 2013
Modified Files:
src/libexec/lfs_cleanerd: Makefile.inc
src/sbin/fsck_lfs: Makefile lfs_user.h
src/sbin/newfs_lfs: Makefile
Log Message:
Redo these changes properly:
-r1.12 libexec/lfs_cleanerd/Makefile
-r1.15 sbin/fsck_lfs/Makefile
-r1.6 sbin/newfs_lfs/Makefile
hi ad@
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/libexec/lfs_cleanerd/Makefile.inc
cvs rdiff -u -r1.19 -r1.20 src/sbin/fsck_lfs/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sbin/fsck_lfs/lfs_user.h
cvs rdiff -u -r1.11 -r1.12 src/sbin/newfs_lfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/lfs_cleanerd/Makefile.inc
diff -u src/libexec/lfs_cleanerd/Makefile.inc:1.4 src/libexec/lfs_cleanerd/Makefile.inc:1.5
--- src/libexec/lfs_cleanerd/Makefile.inc:1.4 Thu Jun 6 00:54:49 2013
+++ src/libexec/lfs_cleanerd/Makefile.inc Sat Jun 8 21:13:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.4 2013/06/06 00:54:49 dholland Exp $
+# $NetBSD: Makefile.inc,v 1.5 2013/06/08 21:13:19 dholland Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
WARNS?=3 # XXX: too many sign-compare issues
@@ -15,8 +15,6 @@ FSCK_LFS= ${NETBSDSRCDIR}/sbin/fsck_lfs
DPADD+= ${LIBUTIL}
LDADD+= -lutil
CPPFLAGS+=-I${FSCK_LFS} -I${NETBSDSRCDIR}/sbin/mount_lfs # -DUSE_CLIENT_SERVER
-CPPFLAGS+="-Dmutex_enter(x)=" "-Dmutex_exit(x)="
-CPPFLAGS+="-DKASSERT(x)="
#CPPFLAGS+=-DREPAIR_ZERO_FINFO
#CPPFLAGS+=-DTEST_PATTERN
Index: src/sbin/fsck_lfs/Makefile
diff -u src/sbin/fsck_lfs/Makefile:1.19 src/sbin/fsck_lfs/Makefile:1.20
--- src/sbin/fsck_lfs/Makefile:1.19 Sat Jun 8 02:16:03 2013
+++ src/sbin/fsck_lfs/Makefile Sat Jun 8 21:13:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2013/06/08 02:16:03 dholland Exp $
+# $NetBSD: Makefile,v 1.20 2013/06/08 21:13:19 dholland Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
WARNS?= 3 # XXX: sign-compare issues
@@ -13,8 +13,7 @@ SRCS+= segwrite.c setup.c utilities.c va
SRCS+= kernelops.c
FSCK= ${NETBSDSRCDIR}/sbin/fsck
.PATH: ${NETBSDSRCDIR}/sys/ufs/lfs ${FSCK}
-CPPFLAGS+=-I${.CURDIR} -I${FSCK} -DIN_FSCK_LFS "-Dmutex_enter(x)=" "-Dmutex_exit(x)="
-CPPFLAGS+="-DKASSERT(x)="
+CPPFLAGS+=-I${.CURDIR} -I${FSCK} -DIN_FSCK_LFS
# -DVERBOSE_BLOCKMAP
LDADD+=-lutil
Index: src/sbin/fsck_lfs/lfs_user.h
diff -u src/sbin/fsck_lfs/lfs_user.h:1.4 src/sbin/fsck_lfs/lfs_user.h:1.5
--- src/sbin/fsck_lfs/lfs_user.h:1.4 Thu Jun 6 00:52:50 2013
+++ src/sbin/fsck_lfs/lfs_user.h Sat Jun 8 21:13:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_user.h,v 1.4 2013/06/06 00:52:50 dholland Exp $ */
+/* $NetBSD: lfs_user.h,v 1.5 2013/06/08 21:13:19 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -49,6 +49,14 @@ struct finfo;
#define simple_lock(arg) /* empty */
#define simple_unlock(arg) /* empty */
+#define mutex_enter(mutex) /* empty */
+#define mutex_exit(mutex) /* empty */
+
+/*
+ * Outside of the kernel use standard assertions
+ */
+#define KASSERT assert
+
/*
* Structure used to pass around logical block paths generated by
* ulfs_getlbns and used by truncate and bmap code.
Index: src/sbin/newfs_lfs/Makefile
diff -u src/sbin/newfs_lfs/Makefile:1.11 src/sbin/newfs_lfs/Makefile:1.12
--- src/sbin/newfs_lfs/Makefile:1.11 Sat Jun 8 02:16:03 2013
+++ src/sbin/newfs_lfs/Makefile Sat Jun 8 21:13:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2013/06/08 02:16:03 dholland Exp $
+# $NetBSD: Makefile,v 1.12 2013/06/08 21:13:19 dholland Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
WARNS?= 3 # XXX: sign-compare issues
@@ -23,7 +23,6 @@ LDADD= -lutil
LDADD+=-lprop
DPADD+=${LIBPROP}
-CPPFLAGS+=-I${FSCK_LFS} -I${FSCK} "-Dmutex_enter(x)=" "-Dmutex_exit(x)=" # -DNDEBUG # -DVERBOSE_BLOCKMAP
-CPPFLAGS+="-DKASSERT(x)="
+CPPFLAGS+=-I${FSCK_LFS} -I${FSCK} # -DNDEBUG # -DVERBOSE_BLOCKMAP
.include <bsd.prog.mk>
