Date: Sun, 12 Aug 2018 08:50:57 -0700 (PDT) From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> To: Konstantin Belousov <kib@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r337682 - in stable/11: share/mk tools/build/options usr.bin/ofed usr.bin/ofed/infiniband-diags Message-ID: <201808121550.w7CFovDw033112@pdx.rh.CN85.dnsmgr.net> In-Reply-To: <201808120845.w7C8jNQU027742@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> Author: kib > Date: Sun Aug 12 08:45:23 2018 > New Revision: 337682 > URL: https://svnweb.freebsd.org/changeset/base/337682 > > Log: > MFC r336569: > Move mostly useless examples binaries from OFED, as well as the Subnet > Manager, under the new option WITH_OFED_EXTRA, disabled by default. I never got a response on putting opensm out from under _EXTRA. > Added: > stable/11/tools/build/options/WITH_OFED_EXTRA > - copied unchanged from r336569, head/tools/build/options/WITH_OFED_EXTRA > Modified: > stable/11/share/mk/src.opts.mk > stable/11/usr.bin/ofed/Makefile > stable/11/usr.bin/ofed/infiniband-diags/Makefile > Directory Properties: > stable/11/ (props changed) > > Modified: stable/11/share/mk/src.opts.mk > ============================================================================== > --- stable/11/share/mk/src.opts.mk Sun Aug 12 08:42:06 2018 (r337681) > +++ stable/11/share/mk/src.opts.mk Sun Aug 12 08:45:23 2018 (r337682) > @@ -197,6 +197,7 @@ __DEFAULT_NO_OPTIONS = \ > LOADER_FORCE_LE \ > NAND \ > OFED \ > + OFED_EXTRA \ > OPENLDAP \ > REPRODUCIBLE_BUILD \ > RPCBIND_WARMSTART_SUPPORT \ > @@ -400,6 +401,10 @@ MK_NLS_CATALOGS:= no > .if ${MK_OPENSSL} == "no" > MK_OPENSSH:= no > MK_KERBEROS:= no > +.endif > + > +.if ${MK_OFED} == "no" > +MK_OFED_EXTRA:= no > .endif > > .if ${MK_PF} == "no" > > Copied: stable/11/tools/build/options/WITH_OFED_EXTRA (from r336569, head/tools/build/options/WITH_OFED_EXTRA) > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ stable/11/tools/build/options/WITH_OFED_EXTRA Sun Aug 12 08:45:23 2018 (r337682, copy of r336569, head/tools/build/options/WITH_OFED_EXTRA) > @@ -0,0 +1,4 @@ > +.\" $FreeBSD$ > +Set to build the non-essential components of the > +.Dq "OpenFabrics Enterprise Distribution" > +Infiniband software stack, mostly examples. > > Modified: stable/11/usr.bin/ofed/Makefile > ============================================================================== > --- stable/11/usr.bin/ofed/Makefile Sun Aug 12 08:42:06 2018 (r337681) > +++ stable/11/usr.bin/ofed/Makefile Sun Aug 12 08:45:23 2018 (r337682) > @@ -1,10 +1,13 @@ > # $FreeBSD$ > > +.include <src.opts.mk> > + > SUBDIR= \ > libibverbs \ > librdmacm \ > - opensm \ > infiniband-diags > + > +SUBDIR.${MK_OFED_EXTRA}+= opensm > > SUBDIR_PARALLEL= > > > Modified: stable/11/usr.bin/ofed/infiniband-diags/Makefile > ============================================================================== > --- stable/11/usr.bin/ofed/infiniband-diags/Makefile Sun Aug 12 08:42:06 2018 (r337681) > +++ stable/11/usr.bin/ofed/infiniband-diags/Makefile Sun Aug 12 08:45:23 2018 (r337682) > @@ -1,27 +1,33 @@ > # $FreeBSD$ > > +.include <src.opts.mk> > + > SUBDIR= \ > -dump_fts \ > -ibaddr \ > -ibcacheedit \ > -ibccconfig \ > -ibccquery \ > -iblinkinfo \ > -ibmirror \ > -ibnetdiscover \ > -ibping \ > -ibportstate \ > -ibqueryerrors \ > -ibroute \ > -ibstat \ > -ibsysstat \ > -ibtracert \ > -perfquery \ > -saquery \ > -sminfo \ > -smpdump \ > -smpquery \ > -vendstat > + ibstat > + > +.if ${MK_OFED_EXTRA} != "no" > +SUBDIR+= \ > + dump_fts \ > + ibaddr \ > + ibcacheedit \ > + ibccconfig \ > + ibccquery \ > + iblinkinfo \ > + ibmirror \ > + ibnetdiscover \ > + ibping \ > + ibportstate \ > + ibqueryerrors \ > + ibroute \ > + ibsysstat \ > + ibtracert \ > + perfquery \ > + saquery \ > + sminfo \ > + smpdump \ > + smpquery \ > + vendstat > +.endif > > SUBDIR_PARALLEL= > > > -- Rod Grimes rgrimes@freebsd.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808121550.w7CFovDw033112>