Module Name: src
Committed By: tron
Date: Mon Jul 18 22:52:37 UTC 2011
Modified Files:
src/usr.sbin/makefs: Makefile makefs.c makefs.h
Log Message:
Re-enable v7fs support in the tools version of "makefs" after the
issues have been fixed by Alan Barrett. Tested under Mac OS X.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/usr.sbin/makefs/Makefile \
src/usr.sbin/makefs/makefs.c
cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/makefs/makefs.h
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/makefs/Makefile
diff -u src/usr.sbin/makefs/Makefile:1.28 src/usr.sbin/makefs/Makefile:1.29
--- src/usr.sbin/makefs/Makefile:1.28 Mon Jul 18 21:22:55 2011
+++ src/usr.sbin/makefs/Makefile Mon Jul 18 22:52:37 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2011/07/18 21:22:55 tron Exp $
+# $NetBSD: Makefile,v 1.29 2011/07/18 22:52:37 tron Exp $
#
WARNS?= 3 # XXX -Wsign-compare
@@ -6,7 +6,7 @@
.include <bsd.own.mk>
PROG= makefs
-SRCS= cd9660.c ffs.c \
+SRCS= cd9660.c ffs.c v7fs.c \
getid.c \
makefs.c misc.c \
pack_dev.c \
@@ -22,13 +22,9 @@
.include "${.CURDIR}/cd9660/Makefile.inc"
.include "${.CURDIR}/ffs/Makefile.inc"
-
-.if !defined(HOSTPROG)
-SRCS+= v7fs.c
-CPPFLAGS+= -DUSE_V7FS
-
.include "${.CURDIR}/v7fs/Makefile.inc"
+.if !defined(HOSTPROG)
DPADD+= ${LIBUTIL}
LDADD+= -lutil
.endif
Index: src/usr.sbin/makefs/makefs.c
diff -u src/usr.sbin/makefs/makefs.c:1.28 src/usr.sbin/makefs/makefs.c:1.29
--- src/usr.sbin/makefs/makefs.c:1.28 Mon Jul 18 17:15:52 2011
+++ src/usr.sbin/makefs/makefs.c Mon Jul 18 22:52:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: makefs.c,v 1.28 2011/07/18 17:15:52 tron Exp $ */
+/* $NetBSD: makefs.c,v 1.29 2011/07/18 22:52:37 tron Exp $ */
/*
* Copyright (c) 2001-2003 Wasabi Systems, Inc.
@@ -41,7 +41,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: makefs.c,v 1.28 2011/07/18 17:15:52 tron Exp $");
+__RCSID("$NetBSD: makefs.c,v 1.29 2011/07/18 22:52:37 tron Exp $");
#endif /* !__lint */
#include <assert.h>
@@ -73,10 +73,8 @@
{ "ffs", ffs_prep_opts, ffs_parse_opts, ffs_cleanup_opts, ffs_makefs },
{ "cd9660", cd9660_prep_opts, cd9660_parse_opts, cd9660_cleanup_opts,
cd9660_makefs},
-#ifdef USE_V7FS
{ "v7fs", v7fs_prep_opts, v7fs_parse_opts, v7fs_cleanup_opts,
v7fs_makefs },
-#endif
{ .type = NULL },
};
Index: src/usr.sbin/makefs/makefs.h
diff -u src/usr.sbin/makefs/makefs.h:1.22 src/usr.sbin/makefs/makefs.h:1.23
--- src/usr.sbin/makefs/makefs.h:1.22 Mon Jul 18 17:15:52 2011
+++ src/usr.sbin/makefs/makefs.h Mon Jul 18 22:52:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: makefs.h,v 1.22 2011/07/18 17:15:52 tron Exp $ */
+/* $NetBSD: makefs.h,v 1.23 2011/07/18 22:52:37 tron Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -170,12 +170,10 @@
void cd9660_cleanup_opts(fsinfo_t *);
void cd9660_makefs(const char *, const char *, fsnode *, fsinfo_t *);
-#ifdef USE_V7FS
void v7fs_prep_opts(fsinfo_t *);
int v7fs_parse_opts(const char *, fsinfo_t *);
void v7fs_cleanup_opts(fsinfo_t *);
void v7fs_makefs(const char *, const char *, fsnode *, fsinfo_t *);
-#endif
extern u_int debug;
extern struct timespec start_time;
