head	1.6;
access;
symbols
	RELENG_8_4:1.5.0.2
	RELENG_9_1_0_RELEASE:1.4.2.1.4.2
	RELENG_9_1:1.4.2.1.0.4
	RELENG_9_1_BP:1.4.2.1
	RELENG_8_3_0_RELEASE:1.2.4.2.2.1
	RELENG_8_3:1.2.4.2.0.2
	RELENG_8_3_BP:1.2.4.2
	RELENG_9_0_0_RELEASE:1.4.2.1.2.1
	RELENG_9_0:1.4.2.1.0.2
	RELENG_9_0_BP:1.4.2.1
	RELENG_9:1.4.0.2
	RELENG_9_BP:1.4
	RELENG_7_4_0_RELEASE:1.2.2.1.6.1
	RELENG_8_2_0_RELEASE:1.2.4.1.6.1
	RELENG_7_4:1.2.2.1.0.6
	RELENG_7_4_BP:1.2.2.1
	RELENG_8_2:1.2.4.1.0.6
	RELENG_8_2_BP:1.2.4.1
	RELENG_8_1_0_RELEASE:1.2.4.1.4.1
	RELENG_8_1:1.2.4.1.0.4
	RELENG_8_1_BP:1.2.4.1
	RELENG_7_3_0_RELEASE:1.2.2.1.4.1
	RELENG_7_3:1.2.2.1.0.4
	RELENG_7_3_BP:1.2.2.1
	RELENG_8_0_0_RELEASE:1.2.4.1.2.1
	RELENG_8_0:1.2.4.1.0.2
	RELENG_8_0_BP:1.2.4.1
	RELENG_8:1.2.0.4
	RELENG_8_BP:1.2
	RELENG_7_2_0_RELEASE:1.2.2.1.2.1
	RELENG_7_2:1.2.2.1.0.2
	RELENG_7_2_BP:1.2.2.1
	RELENG_7:1.2.0.2;
locks; strict;
comment	@# @;


1.6
date	2013.05.10.00.31.45;	author svnexp;	state Exp;
branches;
next	1.5;

1.5
date	2012.11.17.01.54.47;	author svnexp;	state Exp;
branches
	1.5.2.1;
next	1.4;

1.4
date	2011.06.19.18.34.49;	author marcel;	state Exp;
branches
	1.4.2.1;
next	1.3;

1.3
date	2010.11.07.16.05.04;	author cognet;	state Exp;
branches;
next	1.2;

1.2
date	2008.12.19.22.59.05;	author sam;	state Exp;
branches
	1.2.2.1
	1.2.4.1;
next	1.1;

1.1
date	2008.12.19.18.47.46;	author sam;	state Exp;
branches;
next	;

1.5.2.1
date	2012.11.17.01.54.47;	author svnexp;	state dead;
branches;
next	1.5.2.2;

1.5.2.2
date	2013.03.28.13.06.18;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.4.2.1.2.1
	1.4.2.1.4.1;
next	1.4.2.2;

1.4.2.2
date	2012.11.17.11.37.44;	author svnexp;	state Exp;
branches;
next	1.4.2.3;

1.4.2.3
date	2013.06.13.18.01.45;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.4.2.1.2.2;

1.4.2.1.2.2
date	2012.11.17.08.37.41;	author svnexp;	state Exp;
branches;
next	;

1.4.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.4.2.1.4.2;

1.4.2.1.4.2
date	2012.11.17.08.48.33;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	2009.03.19.00.28.54;	author sam;	state Exp;
branches
	1.2.2.1.2.1
	1.2.2.1.4.1
	1.2.2.1.6.1;
next	1.2.2.2;

1.2.2.2
date	2011.07.26.14.41.54;	author marius;	state Exp;
branches;
next	1.2.2.3;

1.2.2.3
date	2012.11.17.08.09.02;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1.2.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.2.2.1.4.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.2.2.1.6.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.2.2.1.6.2;

1.2.2.1.6.2
date	2012.11.17.08.17.48;	author svnexp;	state Exp;
branches;
next	;

1.2.4.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.2.4.1.2.1
	1.2.4.1.4.1
	1.2.4.1.6.1;
next	1.2.4.2;

1.2.4.2
date	2011.07.26.14.41.54;	author marius;	state Exp;
branches
	1.2.4.2.2.1;
next	1.2.4.3;

1.2.4.3
date	2012.11.17.10.37.23;	author svnexp;	state Exp;
branches;
next	;

1.2.4.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.2.4.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.2.4.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.2.4.2.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.2.4.2.2.2;

1.2.4.2.2.2
date	2012.11.17.08.25.55;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.6
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/250407
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@#	$FreeBSD: head/usr.sbin/makefs/Makefile 250407 2013-05-09 14:43:36Z brooks $

PROG=	makefs

CFLAGS+=-I${.CURDIR}

SRCS=	cd9660.c ffs.c \
	makefs.c \
	mtree.c \
	walk.c
MAN=	makefs.8

WARNS?=	2

.include "${.CURDIR}/cd9660/Makefile.inc"
.include "${.CURDIR}/ffs/Makefile.inc"

CFLAGS+=-DHAVE_STRUCT_STAT_ST_FLAGS=1
CFLAGS+=-DHAVE_STRUCT_STAT_ST_GEN=1

.PATH: ${.CURDIR}/../../contrib/mtree
CFLAGS+=-I${.CURDIR}/../../contrib/mtree
SRCS+=	getid.c misc.c spec.c

.PATH: ${.CURDIR}/../../contrib/mknod
CFLAGS+=-I${.CURDIR}/../../contrib/mknod
SRCS+=	pack_dev.c

.PATH:	${.CURDIR}/../../sys/ufs/ffs
SRCS+=	ffs_tables.c

CFLAGS+=	-I${.CURDIR}/../../lib/libnetbsd
LIBNETBSDDIR=	${.OBJDIR}/../../lib/libnetbsd
LIBNETBSD=	${LIBNETBSDDIR}/libnetbsd.a
DPADD+=		${LIBNETBSD}
LDADD+=		${LIBNETBSD}

DPADD+=  ${LIBSBUF} ${LIBUTIL}
LDADD+=  -lsbuf -lutil

.include <bsd.prog.mk>
@


1.5
log
@Switching exporter and resync
@
text
@d1 1
a1 1
#	$FreeBSD: head/usr.sbin/makefs/Makefile 223306 2011-06-19 18:34:49Z marcel $
a7 1
	getid.c \
a16 1
.include "${.CURDIR}/compat/Makefile.inc"
d21 7
a27 3
.PATH:	${.CURDIR}/../mtree
CFLAGS+=-I${.CURDIR}/../mtree
SRCS+=	misc.c spec.c
d32 8
a39 2
DPADD=  ${LIBSBUF}
LDADD=  -lsbuf
@


1.5.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:06:18 +0000
@
text
@d1 33
@


1.5.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 29
#	$FreeBSD: releng/8.4/usr.sbin/makefs/Makefile 224447 2011-07-26 14:41:54Z marius $

PROG=	makefs

CFLAGS+=-I${.CURDIR}

SRCS=	cd9660.c ffs.c \
	getid.c \
	makefs.c \
	walk.c
MAN=	makefs.8

WARNS?=	2

.include "${.CURDIR}/cd9660/Makefile.inc"
.include "${.CURDIR}/ffs/Makefile.inc"
.include "${.CURDIR}/compat/Makefile.inc"

CFLAGS+=-DHAVE_STRUCT_STAT_ST_FLAGS=1
CFLAGS+=-DHAVE_STRUCT_STAT_ST_GEN=1

.PATH:	${.CURDIR}/../mtree
CFLAGS+=-I${.CURDIR}/../mtree
SRCS+=	misc.c spec.c

.PATH:	${.CURDIR}/../../sys/ufs/ffs
SRCS+=	ffs_tables.c

.include <bsd.prog.mk>
@


1.4
log
@SVN rev 223306 on 2011-06-19 18:34:49Z by marcel

Add support for using mtree(5) manifest files to define the image
to be created. The support is based on mtree version 2.0, as used
in libarchive, but adds new features on top of it.

The current implementation is fully functional, but is envisioned
to grow at least the following additional features over time:
o   Add support for the /include special command so that manifest
    files can be constructed using includable fragments.
o   Add support specifying a search path to locate content files.
o   Content file filters: commands that provide file contents on
    stdout.

The manifest file eliminates the need to first construct a tree
as root in order to create an image and allows images (releases)
to be created directly from object trees and/or source trees.

Reviewed by:	deo
Sponsored by:	Juniper Networks, Inc
@
text
@d1 1
a1 1
#	$FreeBSD$
@


1.4.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.4.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
#	$FreeBSD: stable/9/usr.sbin/makefs/Makefile 223306 2011-06-19 18:34:49Z marcel $
@


1.4.2.3
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/251688
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d1 1
a1 1
#	$FreeBSD: stable/9/usr.sbin/makefs/Makefile 251688 2013-06-13 17:13:15Z brooks $
d8 1
d18 1
d23 3
a25 7
.PATH: ${.CURDIR}/../../contrib/mtree
CFLAGS+=-I${.CURDIR}/../../contrib/mtree
SRCS+=	getid.c misc.c spec.c

.PATH: ${.CURDIR}/../../contrib/mknod
CFLAGS+=-I${.CURDIR}/../../contrib/mknod
SRCS+=	pack_dev.c
d30 2
a31 8
CFLAGS+=	-I${.CURDIR}/../../lib/libnetbsd
LIBNETBSDDIR=	${.OBJDIR}/../../lib/libnetbsd
LIBNETBSD=	${LIBNETBSDDIR}/libnetbsd.a
DPADD+=		${LIBNETBSD}
LDADD+=		${LIBNETBSD}

DPADD+=  ${LIBSBUF} ${LIBUTIL}
LDADD+=  -lsbuf -lutil
@


1.4.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.4.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
#	$FreeBSD: releng/9.1/usr.sbin/makefs/Makefile 223306 2011-06-19 18:34:49Z marcel $
@


1.4.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.4.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
#	$FreeBSD: releng/9.0/usr.sbin/makefs/Makefile 223306 2011-06-19 18:34:49Z marcel $
@


1.3
log
@SVN rev 214921 on 2010-11-07 16:05:04Z by cognet

Sync with the latest version from NetBSD. It notably addds ISO9660 support.

Submitted by:	bapt
@
text
@d10 1
d30 3
@


1.2
log
@SVN rev 186342 on 2008-12-19 22:59:05Z by sam

fix pathnames to work w/ buildworld
@
text
@d4 7
d15 3
a17 2
CFLAGS+=-I${.CURDIR}
SRCS=	ffs.c getid.c makefs.c walk.c
a18 2
.PATH:	${.CURDIR}/ffs
CFLAGS+=-I${.CURDIR}/ffs
a20 5
SRCS+=	buf.c ffs_alloc.c ffs_balloc.c ffs_bswap.c ffs_subr.c mkfs.c ufs_bmap.c

.PATH:	${.CURDIR}/compat
CFLAGS+=-I${.CURDIR}/compat
SRCS+=	pwcache.c strsuftoll.c
@


1.2.4.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.2.4.2
log
@SVN rev 224447 on 2011-07-26 14:41:54Z by marius

MFC: r214921, r219954, r219956, r221387, r221470, r221536, r222191

- Sync with the latest version from NetBSD. It notably addds ISO9660 support.
- Add support for synthesizing an APM partition map to map Mac PowerPC
  bootstrap partitions from the ISO9660 boot catalog. This preserves OS X's
  ability to mount the CD, while allowing us a way to provide HFS-ified
  bootstrap code for Open Firmware.
- Add analogs to the -chrp-boot and -prep-boot options to mkisofs.
@
text
@a3 7

CFLAGS+=-I${.CURDIR}

SRCS=	cd9660.c ffs.c \
	getid.c \
	makefs.c \
	walk.c
d8 2
a9 3
.include "${.CURDIR}/cd9660/Makefile.inc"
.include "${.CURDIR}/ffs/Makefile.inc"
.include "${.CURDIR}/compat/Makefile.inc"
d11 2
d15 5
@


1.2.4.3
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
#	$FreeBSD: stable/8/usr.sbin/makefs/Makefile 224447 2011-07-26 14:41:54Z marius $
@


1.2.4.2.2.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.2.4.2.2.2
log
@Switch importer
@
text
@d1 1
a1 1
#	$FreeBSD: releng/8.3/usr.sbin/makefs/Makefile 224447 2011-07-26 14:41:54Z marius $
@


1.2.4.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.2.4.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.2.4.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.2.2.1
log
@SVN rev 190006 on 2009-03-19 00:28:54Z by sam

MFC makefs: a tool for creating a file system image from a directory tree
@
text
@@


1.2.2.2
log
@SVN rev 224448 on 2011-07-26 14:41:54Z by marius

MFC: r214921, r219954, r219956, r221387, r221470, r221536, r222191

- Sync with the latest version from NetBSD. It notably addds ISO9660 support.
- Add support for synthesizing an APM partition map to map Mac PowerPC
  bootstrap partitions from the ISO9660 boot catalog. This preserves OS X's
  ability to mount the CD, while allowing us a way to provide HFS-ified
  bootstrap code for Open Firmware.
- Add analogs to the -chrp-boot and -prep-boot options to mkisofs.
@
text
@a3 7

CFLAGS+=-I${.CURDIR}

SRCS=	cd9660.c ffs.c \
	getid.c \
	makefs.c \
	walk.c
d8 2
a9 3
.include "${.CURDIR}/cd9660/Makefile.inc"
.include "${.CURDIR}/ffs/Makefile.inc"
.include "${.CURDIR}/compat/Makefile.inc"
d11 2
d15 5
@


1.2.2.3
log
@Switch importer
@
text
@d1 1
a1 1
#	$FreeBSD: stable/7/usr.sbin/makefs/Makefile 224448 2011-07-26 14:41:54Z marius $
@


1.2.2.1.6.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.2.2.1.6.2
log
@Switch importer
@
text
@d1 1
a1 1
#	$FreeBSD: releng/7.4/usr.sbin/makefs/Makefile 186342 2008-12-19 22:59:05Z sam $
@


1.2.2.1.4.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.2.2.1.2.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.1
log
@SVN rev 186335 on 2008-12-19 18:47:46Z by sam

import netbsd makefs tool
@
text
@d8 1
a8 1
CFLAGS+=-I.
d12 1
a12 1
CFLAGS+=-Iffs
d18 1
a18 1
CFLAGS+=-Icompat
d22 1
a22 1
CFLAGS+=-I../mtree
@

