[src/trunk]: src/usr.sbin/makefs Re-enable v7fs support in the tools version ...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/01836a92895d
branches:  trunk
changeset: 767456:01836a92895d
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Jul 18 22:52:37 2011 +0000

description:
Re-enable v7fs support in the tools version of "makefs" after the
issues have been fixed by Alan Barrett. Tested under Mac OS X.

diffstat:

 usr.sbin/makefs/Makefile |  10 +++-------
 usr.sbin/makefs/makefs.c |   6 ++----
 usr.sbin/makefs/makefs.h |   4 +---
 3 files changed, 6 insertions(+), 14 deletions(-)

diffs (84 lines):

diff -r cceafadb62c5 -r 01836a92895d usr.sbin/makefs/Makefile
--- a/usr.sbin/makefs/Makefile  Mon Jul 18 22:50:28 2011 +0000
+++ b/usr.sbin/makefs/Makefile  Mon Jul 18 22:52:37 2011 +0000
@@ -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"
+.include "${.CURDIR}/v7fs/Makefile.inc"
 
 .if !defined(HOSTPROG)
-SRCS+=         v7fs.c
-CPPFLAGS+=     -DUSE_V7FS
-
-.include "${.CURDIR}/v7fs/Makefile.inc"
-
 DPADD+= ${LIBUTIL}
 LDADD+= -lutil
 .endif
diff -r cceafadb62c5 -r 01836a92895d usr.sbin/makefs/makefs.c
--- a/usr.sbin/makefs/makefs.c  Mon Jul 18 22:50:28 2011 +0000
+++ b/usr.sbin/makefs/makefs.c  Mon Jul 18 22:52:37 2011 +0000
@@ -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  },
 };
 
diff -r cceafadb62c5 -r 01836a92895d usr.sbin/makefs/makefs.h
--- a/usr.sbin/makefs/makefs.h  Mon Jul 18 22:50:28 2011 +0000
+++ b/usr.sbin/makefs/makefs.h  Mon Jul 18 22:52:37 2011 +0000
@@ -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;