svn commit: r314579 - in head: share/mk targets/pseudo/userland tools/build/options tools/tools/cxgbetool usr.sbin usr.sbin/cxgbetool
Navdeep Parhar
np at FreeBSD.org
Fri Mar 3 03:12:00 UTC 2017
Author: np
Date: Fri Mar 3 03:11:58 2017
New Revision: 314579
URL: https://svnweb.freebsd.org/changeset/base/314579
Log:
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.
Reviewed by: ngie@, gnn@, bdrewery@
MFC after: 1 month
Sponsored by: Chelsio Communications
Differential Revision: https://reviews.freebsd.org/D9854
Added:
head/tools/build/options/WITHOUT_CXGBETOOL (contents, props changed)
head/tools/build/options/WITH_CXGBETOOL (contents, props changed)
head/usr.sbin/cxgbetool/
- copied from r314578, head/tools/tools/cxgbetool/
head/usr.sbin/cxgbetool/Makefile.depend (contents, props changed)
Deleted:
head/tools/tools/cxgbetool/
Modified:
head/share/mk/src.opts.mk
head/targets/pseudo/userland/Makefile.depend
head/usr.sbin/Makefile
head/usr.sbin/cxgbetool/Makefile
Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk Fri Mar 3 03:07:54 2017 (r314578)
+++ head/share/mk/src.opts.mk Fri Mar 3 03:11:58 2017 (r314579)
@@ -275,6 +275,13 @@ BROKEN_OPTIONS+=SSP
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: head/targets/pseudo/userland/Makefile.depend
==============================================================================
--- head/targets/pseudo/userland/Makefile.depend Fri Mar 3 03:07:54 2017 (r314578)
+++ head/targets/pseudo/userland/Makefile.depend Fri Mar 3 03:11:58 2017 (r314579)
@@ -895,6 +895,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
Added: head/tools/build/options/WITHOUT_CXGBETOOL
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_CXGBETOOL Fri Mar 3 03:11:58 2017 (r314579)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to not build
+.Xr cxgbetool 8
Added: head/tools/build/options/WITH_CXGBETOOL
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITH_CXGBETOOL Fri Mar 3 03:11:58 2017 (r314579)
@@ -0,0 +1,3 @@
+.\" $FreeBSD$
+Set to build
+.Xr cxgbetool 8
Modified: head/usr.sbin/Makefile
==============================================================================
--- head/usr.sbin/Makefile Fri Mar 3 03:07:54 2017 (r314578)
+++ head/usr.sbin/Makefile Fri Mar 3 03:11:58 2017 (r314579)
@@ -123,6 +123,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
SUBDIR.${MK_FLOPPY}+= fdcontrol
Modified: head/usr.sbin/cxgbetool/Makefile
==============================================================================
--- head/tools/tools/cxgbetool/Makefile Fri Mar 3 03:07:54 2017 (r314578)
+++ head/usr.sbin/cxgbetool/Makefile Fri Mar 3 03:11:58 2017 (r314579)
@@ -1,9 +1,8 @@
# $FreeBSD$
PROG= cxgbetool
-SRCS= cxgbetool.c
MAN= cxgbetool.8
-CFLAGS+= -I${.CURDIR}/../../../sys/dev/cxgbe -I${.CURDIR}/../../../sys -I.
-BINDIR?= /usr/sbin
+CFLAGS+= -I${SRCTOP}/sys/dev/cxgbe -I${SRCTOP}/sys -I.
+WARNS?= 2
.include <bsd.prog.mk>
Added: head/usr.sbin/cxgbetool/Makefile.depend
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/cxgbetool/Makefile.depend Fri Mar 3 03:11:58 2017 (r314579)
@@ -0,0 +1,19 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
+ include \
+ include/arpa \
+ include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libcompiler_rt \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
More information about the svn-src-head
mailing list