Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't include v7fs support into tool version of "makefs" because it 

breaks the build.
This commit is contained in:
tron 2011-07-18 17:15:51 +00:00
parent 2c0999f3fa
commit 043cc21d99
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/makefs/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.26 2011/07/18 08:58:38 uch Exp $
# $NetBSD: Makefile,v 1.27 2011/07/18 17:15:51 tron Exp $
#
WARNS?= 3 # XXX -Wsign-compare
@ -6,7 +6,7 @@ WARNS?= 3 # XXX -Wsign-compare
.include <bsd.own.mk>
PROG= makefs
SRCS= cd9660.c ffs.c v7fs.c \
SRCS= cd9660.c ffs.c \
getid.c \
makefs.c misc.c \
pack_dev.c \
@ -22,9 +22,11 @@ CPPFLAGS+= -I${.CURDIR} -I${MKNODSRC} -I${MTREESRC}
.include "${.CURDIR}/cd9660/Makefile.inc"
.include "${.CURDIR}/ffs/Makefile.inc"
.if !defined(HOSTPROG)
SRCS+= v7fs.c
.include "${.CURDIR}/v7fs/Makefile.inc"
.if (${HOSTPROG:U} == "")
DPADD+= ${LIBUTIL}
LDADD+= -lutil
.endif

6
usr.sbin/makefs/makefs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: makefs.c,v 1.27 2011/07/18 08:58:38 uch Exp $ */
/* $NetBSD: makefs.c,v 1.28 2011/07/18 17:15:52 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.27 2011/07/18 08:58:38 uch Exp $");
__RCSID("$NetBSD: makefs.c,v 1.28 2011/07/18 17:15:52 tron Exp $");
#endif /* !__lint */
#include <assert.h>
@ -73,8 +73,10 @@ static fstype_t fstypes[] = {
{ "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 },
};

4
usr.sbin/makefs/makefs.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: makefs.h,v 1.21 2011/07/18 08:58:38 uch Exp $ */
/* $NetBSD: makefs.h,v 1.22 2011/07/18 17:15:52 tron Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@ -170,10 +170,12 @@ int cd9660_parse_opts(const char *, fsinfo_t *);
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;