Date: Wed, 30 Dec 2009 17:38:44 -0500 From: John Baldwin <jhb@freebsd.org> To: Oliver Pinter <oliver.pntr@gmail.com> 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 Message-ID: <200912301738.44368.jhb@freebsd.org> In-Reply-To: <6101e8c40912301335h6ba1a529s99366eb67779b876@mail.gmail.com> References: <200912301745.nBUHjaXM065924@svn.freebsd.org> <6101e8c40912301335h6ba1a529s99366eb67779b876@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wednesday 30 December 2009 4:35:03 pm Oliver Pinter wrote: > remove duplocated .include <bsd.own.mk> > > -- > --- 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 <bsd.own.mk> > > -.include <bsd.own.mk> > - > SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot kgzldr \ > libi386 libfirewire loader Oops, will fix, thanks! > On 12/30/09, John Baldwin <jhb@freebsd.org> 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 <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> > > _______________________________________________ > > 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912301738.44368.jhb>