From owner-svn-src-head@freebsd.org Fri Jul 20 23:52:13 2018 Return-Path: Delivered-To: svn-src-head@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 F0B0E102A4C4; Fri, 20 Jul 2018 23:52:12 +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 A5AD971F9C; Fri, 20 Jul 2018 23:52:12 +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 8852817252; Fri, 20 Jul 2018 23:52:12 +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 w6KNqCHY092342; Fri, 20 Jul 2018 23:52:12 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6KNqBqF092338; Fri, 20 Jul 2018 23:52:11 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201807202352.w6KNqBqF092338@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Fri, 20 Jul 2018 23:52:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336569 - in head: share/mk tools/build/options usr.bin/ofed usr.bin/ofed/infiniband-diags X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in head: share/mk tools/build/options usr.bin/ofed usr.bin/ofed/infiniband-diags X-SVN-Commit-Revision: 336569 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jul 2018 23:52:13 -0000 Author: kib Date: Fri Jul 20 23:52:11 2018 New Revision: 336569 URL: https://svnweb.freebsd.org/changeset/base/336569 Log: Move mostly useless examples binaries from OFED, as well as the Subnet Manager, under the new option WITH_OFED_EXTRA, disabled by default. Reviewed by: bdrewery, hselasky (previous version) Sponsored by: Mellanox Technologies MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D16230 Added: head/tools/build/options/WITH_OFED_EXTRA (contents, props changed) Modified: head/share/mk/src.opts.mk head/usr.bin/ofed/Makefile head/usr.bin/ofed/infiniband-diags/Makefile Modified: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Fri Jul 20 23:49:57 2018 (r336568) +++ head/share/mk/src.opts.mk Fri Jul 20 23:52:11 2018 (r336569) @@ -199,6 +199,7 @@ __DEFAULT_NO_OPTIONS = \ LOADER_LUA \ NAND \ OFED \ + OFED_EXTRA \ OPENLDAP \ REPRODUCIBLE_BUILD \ RPCBIND_WARMSTART_SUPPORT \ @@ -464,6 +465,10 @@ MK_KERBEROS:= no .if ${MK_PF} == "no" MK_AUTHPF:= no +.endif + +.if ${MK_OFED} == "no" +MK_OFED_EXTRA:= no .endif .if ${MK_PORTSNAP} == "no" Added: head/tools/build/options/WITH_OFED_EXTRA ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_OFED_EXTRA Fri Jul 20 23:52:11 2018 (r336569) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to build the non-essential components of the +.Dq "OpenFabrics Enterprise Distribution" +Infiniband software stack, mostly examples. Modified: head/usr.bin/ofed/Makefile ============================================================================== --- head/usr.bin/ofed/Makefile Fri Jul 20 23:49:57 2018 (r336568) +++ head/usr.bin/ofed/Makefile Fri Jul 20 23:52:11 2018 (r336569) @@ -1,10 +1,13 @@ # $FreeBSD$ +.include + SUBDIR= \ libibverbs \ librdmacm \ - opensm \ infiniband-diags + +SUBDIR.${MK_OFED_EXTRA}+= opensm SUBDIR_PARALLEL= Modified: head/usr.bin/ofed/infiniband-diags/Makefile ============================================================================== --- head/usr.bin/ofed/infiniband-diags/Makefile Fri Jul 20 23:49:57 2018 (r336568) +++ head/usr.bin/ofed/infiniband-diags/Makefile Fri Jul 20 23:52:11 2018 (r336569) @@ -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=