Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 30 Dec 2009 17:45:36 +0000 (UTC)
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r201266 - stable/7/sys/boot/i386
Message-ID:  <200912301745.nBUHjaXM065924@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhb
Date: Wed Dec 30 17:45:35 2009
New Revision: 201266
URL: http://svn.freebsd.org/changeset/base/201266

Log:
  MFC 200872:
  Don't build zfsboot, gptzfsboot, and zfsloader if WITHOUT_ZFS is enabled.

Modified:
  stable/7/sys/boot/i386/Makefile
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/boot/i386/Makefile
==============================================================================
--- stable/7/sys/boot/i386/Makefile	Wed Dec 30 17:42:41 2009	(r201265)
+++ stable/7/sys/boot/i386/Makefile	Wed Dec 30 17:45:35 2009	(r201266)
@@ -1,10 +1,16 @@
 # $FreeBSD$
 .include <bsd.own.mk>
 
-SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot zfsboot \
-		gptzfsboot kgzldr libi386 libfirewire loader zfsloader
+.include <bsd.own.mk>
+
+SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot kgzldr \
+		libi386 libfirewire loader
 
 # special boot programs, 'self-extracting boot2+loader'
 SUBDIR+=	pxeldr
 
+.if ${MK_ZFS} != "no"
+SUBDIR+=	zfsboot gptzfsboot zfsloader
+.endif
+
 .include <bsd.subdir.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912301745.nBUHjaXM065924>