From owner-svn-src-stable@freebsd.org Sun Aug 12 08:45:24 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A4AB21069341; Sun, 12 Aug 2018 08:45:24 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 59CE07F3A0; Sun, 12 Aug 2018 08:45:24 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3AF9C23C55; Sun, 12 Aug 2018 08:45:24 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7C8jOBw027746; Sun, 12 Aug 2018 08:45:24 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7C8jNQU027742; Sun, 12 Aug 2018 08:45:23 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201808120845.w7C8jNQU027742@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 12 Aug 2018 08:45:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r337682 - in stable/11: share/mk tools/build/options usr.bin/ofed usr.bin/ofed/infiniband-diags X-SVN-Group: stable-11 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in stable/11: share/mk tools/build/options usr.bin/ofed usr.bin/ofed/infiniband-diags X-SVN-Commit-Revision: 337682 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Aug 2018 08:45:24 -0000 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. 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 + 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 + 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=