head	1.3;
access;
symbols
	RELENG_8_4:1.3.0.2
	RELENG_9_1_0_RELEASE:1.2.2.1.4.2
	RELENG_9_1:1.2.2.1.0.4
	RELENG_9_1_BP:1.2.2.1
	RELENG_8_3_0_RELEASE:1.1.2.3.4.1
	RELENG_8_3:1.1.2.3.0.4
	RELENG_8_3_BP:1.1.2.3
	RELENG_9_0_0_RELEASE:1.2.2.1.2.1
	RELENG_9_0:1.2.2.1.0.2
	RELENG_9_0_BP:1.2.2.1
	RELENG_9:1.2.0.2
	RELENG_9_BP:1.2
	RELENG_7_4_0_RELEASE:1.1.4.3.2.1
	RELENG_8_2_0_RELEASE:1.1.2.3.2.1
	RELENG_7_4:1.1.4.3.0.2
	RELENG_7_4_BP:1.1.4.3
	RELENG_8_2:1.1.2.3.0.2
	RELENG_8_2_BP:1.1.2.3
	RELENG_8_1_0_RELEASE:1.1.2.2.2.1
	RELENG_8_1:1.1.2.2.0.2
	RELENG_8_1_BP:1.1.2.2
	RELENG_7_3_0_RELEASE:1.1.4.2.2.1
	RELENG_7_3:1.1.4.2.0.2
	RELENG_7_3_BP:1.1.4.2
	RELENG_7:1.1.0.4
	RELENG_8:1.1.0.2;
locks; strict;
comment	@# @;


1.3
date	2012.11.17.01.51.18;	author svnexp;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2010.08.31.19.01.12;	author delphij;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2009.11.23.16.00.16;	author rnoland;	state Exp;
branches
	1.1.2.1
	1.1.4.1;
next	;

1.3.2.1
date	2012.11.17.01.51.18;	author svnexp;	state dead;
branches;
next	1.3.2.2;

1.3.2.2
date	2013.03.28.13.04.02;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.2.2.1.2.1
	1.2.2.1.4.1;
next	1.2.2.2;

1.2.2.2
date	2012.11.17.11.36.47;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.2.2.1.2.2;

1.2.2.1.2.2
date	2012.11.17.08.36.46;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.2.2.1.4.2;

1.2.2.1.4.2
date	2012.11.17.08.47.36;	author svnexp;	state Exp;
branches;
next	;

1.1.2.1
date	2009.12.07.16.37.02;	author rnoland;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2009.12.07.16.37.02;	author rnoland;	state Exp;
branches
	1.1.2.2.2.1;
next	1.1.2.3;

1.1.2.3
date	2010.09.07.18.14.59;	author delphij;	state Exp;
branches
	1.1.2.3.2.1
	1.1.2.3.4.1;
next	1.1.2.4;

1.1.2.4
date	2012.11.17.10.36.27;	author svnexp;	state Exp;
branches;
next	;

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

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

1.1.2.3.4.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.1.2.3.4.2;

1.1.2.3.4.2
date	2012.11.17.08.25.07;	author svnexp;	state Exp;
branches;
next	;

1.1.4.1
date	2009.12.07.17.15.36;	author rnoland;	state dead;
branches;
next	1.1.4.2;

1.1.4.2
date	2009.12.07.17.15.36;	author rnoland;	state Exp;
branches
	1.1.4.2.2.1;
next	1.1.4.3;

1.1.4.3
date	2010.09.07.18.14.50;	author delphij;	state Exp;
branches
	1.1.4.3.2.1;
next	1.1.4.4;

1.1.4.4
date	2012.11.17.08.04.54;	author svnexp;	state Exp;
branches;
next	;

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

1.1.4.3.2.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.1.4.3.2.2;

1.1.4.3.2.2
date	2012.11.17.08.17.05;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/sys/boot/i386/zfsloader/Makefile 212066 2010-08-31 19:01:12Z delphij $

.PATH:	${.CURDIR}/../loader

LOADER=		zfsloader
NEWVERSWHAT=	"ZFS enabled bootstrap loader" x86
LOADER_ZFS_SUPPORT=yes
LOADER_ONLY=	yes
NO_MAN=		yes

.include "${.CURDIR}/../loader/Makefile"

@


1.3.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:04:02 +0000
@
text
@d1 12
@


1.3.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 12
# $FreeBSD: releng/8.4/sys/boot/i386/zfsloader/Makefile 212301 2010-09-07 18:14:59Z delphij $

.PATH:	${.CURDIR}/../loader

LOADER=		zfsloader
NEWVERSWHAT=	"ZFS enabled bootstrap loader" x86
LOADER_ZFS_SUPPORT=yes
LOADER_ONLY=	yes
NO_MAN=		yes

.include "${.CURDIR}/../loader/Makefile"

@


1.2
log
@SVN rev 212066 on 2010-08-31 19:01:12Z by delphij

For consistency, change all 'i386' and MACHINE_ARCH to x86.

Reviewed by:	jhb
MFC after:	1 week
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.2.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.2.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/sys/boot/i386/zfsloader/Makefile 212066 2010-08-31 19:01:12Z delphij $
@


1.2.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.2.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/boot/i386/zfsloader/Makefile 212066 2010-08-31 19:01:12Z delphij $
@


1.2.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.2.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/boot/i386/zfsloader/Makefile 212066 2010-08-31 19:01:12Z delphij $
@


1.1
log
@SVN rev 199714 on 2009-11-23 16:00:16Z by rnoland

Create a seperate ZFS enabled loader.

This adds zfsloader which will be called by zfsboot/gptzfsboot code rather
than the tradional loader.  This eliminates the need to set the
LOADER_ZFS_SUPPORT variable in order to get a ZFS enabled loader.

Note however, that you must reinstall your bootcode (zfsboot/gptzfsboot)
in order for the boot process to use the new loader.

New installations will no longer be required to build a ZFS enabled
loader for a working ZFS boot system.  Installing zfsboot/gptzfsboot is
sufficient for acknowledging the use of CDDL code and therefore the ZFS
enabled loader.

Based on a previous patch from jhb@@

Reviewed by:	jhb@@
MFC after:	2 weeks
@
text
@d6 1
a6 1
NEWVERSWHAT=	"ZFS enabled bootstrap loader" i386
@


1.1.4.1
log
@file Makefile was added on branch RELENG_7 on 2009-12-07 17:17:33 +0000
@
text
@d1 12
@


1.1.4.2
log
@SVN rev 200221 on 2009-12-07 17:15:36Z by rnoland

MFC 199714

Create a seperate ZFS enabled loader.

This adds zfsloader which will be called by zfsboot/gptzfsboot code rather
than the tradional loader.  This eliminates the need to set the
LOADER_ZFS_SUPPORT variable in order to get a ZFS enabled loader.

Note however, that you must reinstall your bootcode (zfsboot/gptzfsboot)
in order for the boot process to use the new loader.

New installations will no longer be required to build a ZFS enabled
loader for a working ZFS boot system.  Installing zfsboot/gptzfsboot is
sufficient for acknowledging the use of CDDL code and therefore the ZFS
enabled loader.
@
text
@a0 12
# $FreeBSD$

.PATH:	${.CURDIR}/../loader

LOADER=		zfsloader
NEWVERSWHAT=	"ZFS enabled bootstrap loader" i386
LOADER_ZFS_SUPPORT=yes
LOADER_ONLY=	yes
NO_MAN=		yes

.include "${.CURDIR}/../loader/Makefile"

@


1.1.4.3
log
@SVN rev 212300 on 2010-09-07 18:14:50Z by delphij

MFC r205662 + r212066 (except efi part):

Our boot loader is capable of booting both i386 and amd64 kernels so
call it "x86" instead of "i386".
@
text
@d6 1
a6 1
NEWVERSWHAT=	"ZFS enabled bootstrap loader" x86
@


1.1.4.4
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/sys/boot/i386/zfsloader/Makefile 212300 2010-09-07 18:14:50Z delphij $
@


1.1.4.3.2.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.1.4.3.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/sys/boot/i386/zfsloader/Makefile 212300 2010-09-07 18:14:50Z delphij $
@


1.1.4.2.2.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.1.2.1
log
@file Makefile was added on branch RELENG_8 on 2009-12-07 16:37:54 +0000
@
text
@d1 12
@


1.1.2.2
log
@SVN rev 200220 on 2009-12-07 16:37:02Z by rnoland

MFC 199714

Create a seperate ZFS enabled loader.

This adds zfsloader which will be called by zfsboot/gptzfsboot code rather
than the tradional loader.  This eliminates the need to set the
LOADER_ZFS_SUPPORT variable in order to get a ZFS enabled loader.

Note however, that you must reinstall your bootcode (zfsboot/gptzfsboot)
in order for the boot process to use the new loader.

New installations will no longer be required to build a ZFS enabled
loader for a working ZFS boot system.  Installing zfsboot/gptzfsboot is
sufficient for acknowledging the use of CDDL code and therefore the ZFS
enabled loader.
@
text
@a0 12
# $FreeBSD$

.PATH:	${.CURDIR}/../loader

LOADER=		zfsloader
NEWVERSWHAT=	"ZFS enabled bootstrap loader" i386
LOADER_ZFS_SUPPORT=yes
LOADER_ONLY=	yes
NO_MAN=		yes

.include "${.CURDIR}/../loader/Makefile"

@


1.1.2.3
log
@SVN rev 212301 on 2010-09-07 18:14:59Z by delphij

MFC r205662 + r212066 (except efi part):

Our boot loader is capable of booting both i386 and amd64 kernels so
call it "x86" instead of "i386".
@
text
@d6 1
a6 1
NEWVERSWHAT=	"ZFS enabled bootstrap loader" x86
@


1.1.2.4
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/sys/boot/i386/zfsloader/Makefile 212301 2010-09-07 18:14:59Z delphij $
@


1.1.2.3.4.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.1.2.3.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sys/boot/i386/zfsloader/Makefile 212301 2010-09-07 18:14:59Z delphij $
@


1.1.2.3.2.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.1.2.2.2.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
@@


