From owner-svn-src-all@FreeBSD.ORG Wed Dec 30 21:35:15 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 509F4106568D; Wed, 30 Dec 2009 21:35:15 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Received: from mail-bw0-f213.google.com (mail-bw0-f213.google.com [209.85.218.213]) by mx1.freebsd.org (Postfix) with ESMTP id 30C828FC1C; Wed, 30 Dec 2009 21:35:13 +0000 (UTC) Received: by bwz5 with SMTP id 5so7827773bwz.3 for ; Wed, 30 Dec 2009 13:35:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type; bh=uQEXmBcELxLz7Vm0vT89dljJ8igcRKdunJ9RwGKfpNE=; b=iorSN7QE1hqqTb1NNPyG1ehRJYxPc961QUxj/j7avQGyTouxq3OUoysppzPPTxGS4J I9Nd9qcpcekpuyHMoqFX5yDQlvGW9KX9udQd7xsnvIlnlKEhZbYj+QD7RR6iU8oMnSDx kE6zfZGCteyeMmrkpY4x159k2mNZ/lez/jyJo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=hcO80CrHTPSRS+myQzTfWFRB1Dd9cwg/anAVGoJw1HExMmxX4R69iiJTi2B611yIro bZicxC1jcIMY5Btjn6bGNGrM+l2Wifth+etvsKI2JErTQ2KZR7YJTen3YFtHcHOzxnn3 bdb+P6LvtILUZ9KlgmKjtcgPONSlxtVkfg1xg= MIME-Version: 1.0 Received: by 10.204.3.220 with SMTP id 28mr4892542bko.4.1262208903895; Wed, 30 Dec 2009 13:35:03 -0800 (PST) In-Reply-To: <200912301745.nBUHjaXM065924@svn.freebsd.org> References: <200912301745.nBUHjaXM065924@svn.freebsd.org> Date: Wed, 30 Dec 2009 22:35:03 +0100 Message-ID: <6101e8c40912301335h6ba1a529s99366eb67779b876@mail.gmail.com> From: Oliver Pinter To: John Baldwin Content-Type: text/plain; charset=ISO-8859-1 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-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Dec 2009 21:35:15 -0000 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 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" >