From owner-svn-src-stable-7@FreeBSD.ORG Thu Dec 31 12:47:14 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9FD32106566B; Thu, 31 Dec 2009 12:47:14 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 6F9228FC15; Thu, 31 Dec 2009 12:47:14 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 2118246B52; Thu, 31 Dec 2009 07:47:14 -0500 (EST) Received: from jhbbsd.localnet (unknown [209.249.190.9]) by bigwig.baldwin.cx (Postfix) with ESMTPA id 6BD848A01D; Thu, 31 Dec 2009 07:47:08 -0500 (EST) From: John Baldwin To: Oliver Pinter Date: Wed, 30 Dec 2009 17:38:44 -0500 User-Agent: KMail/1.12.1 (FreeBSD/7.2-CBSD-20091103; KDE/4.3.1; amd64; ; ) References: <200912301745.nBUHjaXM065924@svn.freebsd.org> <6101e8c40912301335h6ba1a529s99366eb67779b876@mail.gmail.com> In-Reply-To: <6101e8c40912301335h6ba1a529s99366eb67779b876@mail.gmail.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200912301738.44368.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Thu, 31 Dec 2009 07:47:08 -0500 (EST) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.0 required=4.2 tests=AWL,BAYES_00, DATE_IN_PAST_12_24,RDNS_NONE autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-7@freebsd.org Subject: Re: svn commit: r201266 - stable/7/sys/boot/i386 X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Dec 2009 12:47:14 -0000 On Wednesday 30 December 2009 4:35:03 pm Oliver Pinter wrote: > remove duplocated .include > > -- > --- Makefile.orig 2009-12-30 22:33:30.000000000 +0100 > +++ Makefile 2009-12-30 22:33:36.000000000 +0100 > @@ -1,8 +1,6 @@ > # $FreeBSD$ > .include > > -.include > - > SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot kgzldr \ > libi386 libfirewire loader Oops, will fix, thanks! > On 12/30/09, John Baldwin wrote: > > 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 > > > > -SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot zfsboot \ > > - gptzfsboot kgzldr libi386 libfirewire loader zfsloader > > +.include > > + > > +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 > > _______________________________________________ > > svn-src-stable@freebsd.org mailing list > > http://lists.freebsd.org/mailman/listinfo/svn-src-stable > > To unsubscribe, send any mail to "svn-src-stable-unsubscribe@freebsd.org" > > > -- John Baldwin