svn commit: r319388 - in stable/11: share/mk targets/pseudo/userland tools/build/options tools/tools/cxgbetool usr.sbin usr.sbin/cxgbetool

Thu Jun 1 06:56:34 UTC 2017

Author: ngie
Date: Thu Jun  1 06:56:32 2017
New Revision: 319388
URL: https://svnweb.freebsd.org/changeset/base/319388

Log:
  MFC r314579,r314785:
  
  r314579 (by np):
  
  Add cxgbetool(8) to the base system.
  
  Move cxgbetool from tools/tools to usr.sbin. Compile and install it on
  platforms where cxgbe(4) is built by default.  Knobs (WITH_CXGBETOOL and
  WITHOUT_CXGBETOOL) have been added so that the user can override the
  default setting.
  
  r314785:
  
  Fix some trivial manlint warnings
  
  Sentences should begin on new lines, per manlint.
  
  Bump .Dd for the change

Added:
  stable/11/tools/build/options/WITHOUT_CXGBETOOL
     - copied unchanged from r314579, head/tools/build/options/WITHOUT_CXGBETOOL
  stable/11/tools/build/options/WITH_CXGBETOOL
     - copied unchanged from r314579, head/tools/build/options/WITH_CXGBETOOL
  stable/11/usr.sbin/cxgbetool/
     - copied from r314579, head/usr.sbin/cxgbetool/
Deleted:
  stable/11/tools/tools/cxgbetool/
Modified:
  stable/11/share/mk/src.opts.mk
  stable/11/targets/pseudo/userland/Makefile.depend
  stable/11/usr.sbin/Makefile
  stable/11/usr.sbin/cxgbetool/cxgbetool.8
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/share/mk/src.opts.mk
==============================================================================

--- stable/11/share/mk/src.opts.mk	Thu Jun  1 06:42:21 2017	(r319387)
+++ stable/11/share/mk/src.opts.mk	Thu Jun  1 06:56:32 2017	(r319388)
@@ -271,6 +271,13 @@ BROKEN_OPTIONS+=LIBSOFT
 BROKEN_OPTIONS+=EFI
 .endif
 
+.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "i386" || \
+    ${__T} == "powerpc64" || ${__T} == "sparc64"
+__DEFAULT_YES_OPTIONS+=CXGBETOOL
+.else
+__DEFAULT_NO_OPTIONS+=CXGBETOOL
+.endif
+
 .include <bsd.mkopt.mk>
 
 #

Modified: stable/11/targets/pseudo/userland/Makefile.depend
==============================================================================
--- stable/11/targets/pseudo/userland/Makefile.depend	Thu Jun  1 06:42:21 2017	(r319387)
+++ stable/11/targets/pseudo/userland/Makefile.depend	Thu Jun  1 06:56:32 2017	(r319388)
@@ -908,6 +908,10 @@ DIRDEPS+= \
 	usr.sbin/blacklistd
 .endif
 
+.if ${MK_CXGBETOOL} != "no"
+DIRDEPS+= usr.sbin/cxgbetool
+.endif
+
 .if ${MK_GPL_DTC} != "yes"
 DIRDEPS+= usr.bin/dtc
 .endif

Copied: stable/11/tools/build/options/WITHOUT_CXGBETOOL (from r314579, head/tools/build/options/WITHOUT_CXGBETOOL)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/11/tools/build/options/WITHOUT_CXGBETOOL	Thu Jun  1 06:56:32 2017	(r319388, copy of r314579, head/tools/build/options/WITHOUT_CXGBETOOL)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build
+.Xr cxgbetool 8

Copied: stable/11/tools/build/options/WITH_CXGBETOOL (from r314579, head/tools/build/options/WITH_CXGBETOOL)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/11/tools/build/options/WITH_CXGBETOOL	Thu Jun  1 06:56:32 2017	(r319388, copy of r314579, head/tools/build/options/WITH_CXGBETOOL)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to build
+.Xr cxgbetool 8

Modified: stable/11/usr.sbin/Makefile
==============================================================================
--- stable/11/usr.sbin/Makefile	Thu Jun  1 06:42:21 2017	(r319387)
+++ stable/11/usr.sbin/Makefile	Thu Jun  1 06:56:32 2017	(r319388)
@@ -122,6 +122,7 @@ SUBDIR.${MK_BOOTPARAMD}+=	bootparamd
 SUBDIR.${MK_BSDINSTALL}+=	bsdinstall
 SUBDIR.${MK_BSNMP}+=	bsnmpd
 SUBDIR.${MK_CTM}+=	ctm
+SUBDIR.${MK_CXGBETOOL}+=	cxgbetool
 SUBDIR.${MK_DIALOG}+=	bsdconfig
 SUBDIR.${MK_EFI}+=	efivar efidp
 SUBDIR.${MK_FLOPPY}+=	fdcontrol

Modified: stable/11/usr.sbin/cxgbetool/cxgbetool.8
==============================================================================
--- head/usr.sbin/cxgbetool/cxgbetool.8	Fri Mar  3 03:11:58 2017	(r314579)
+++ stable/11/usr.sbin/cxgbetool/cxgbetool.8	Thu Jun  1 06:56:32 2017	(r319388)
@@ -31,7 +31,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 1, 2013
+.Dd March 6, 2017
 .Dt CXGBETOOL 8
 .Os
 .Sh NAME
@@ -133,7 +133,8 @@ or
 .Va dev.cxgbe.%d.ofld_rxq.%d.fl.cntxt_id Ns .
 Note that freelists are egress queues too.
 .It Ar flm_cntxt_id
-context id of a freelist manager.  The FLM context id is displayed in the
+context id of a freelist manager.
+The FLM context id is displayed in the
 egress context dump of a freelist as FLMcontextID.
 .El
 .It Cm filter mode Op Ar match-criteria ...
@@ -379,7 +380,8 @@ The card's memory map is available in
 .Va dev.t4nex.%d.misc.meminfo Ns .
 .It Bro Cm reg | reg64 Brc Ar addr Ns Op Ar =val
 .It Cm regdump Op Ar register-block ...
-Display contents of device registers.  One or more
+Display contents of device registers.
+One or more
 .Ar register-block
 can be specified to limit the registers displayed.
 The default is to display registers for all blocks.
@@ -400,7 +402,8 @@ A non-zero value will enable "minmax" mode; a zero val
 .Pp
 NOTE:  Many (most) of the parameters and constraints are adapter-specific
 - for instance the number of channels and classes which are available
-whether various modes are implemented, etc.  Consult the adapter documentation for specific information on any limitations.
+whether various modes are implemented, etc.
+Consult the adapter documentation for specific information on any limitations.
 .El
 .It Cm sched-class params Op Ar param Ar value
 Configure parameters for a scheduling class.
@@ -471,7 +474,8 @@ The weight to be used for a weighted-round-robin sched
 The average packet size will be used to compute scheduler constraints for a rate-limited scheduler class hierarchy.
 .Pp
 NOTE:  Many (most) of the parameters and constraints are adapter-specific - for instance the number of channels and classes which are available,
-whether various modes are implemented, etc.  Consult the adapter documentation for specific information on any limitations.
+whether various modes are implemented, etc.
+Consult the adapter documentation for specific information on any limitations.
 .El
 .It Cm sched-queue Ar port queue class
 Bind the indicated port's NIC TX
