The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=35466a69bb00e1124c9db5eb286be0dbc445a464
commit 35466a69bb00e1124c9db5eb286be0dbc445a464 Author: Emmanuel Vadot <[email protected]> AuthorDate: 2021-06-19 15:49:57 +0000 Commit: Emmanuel Vadot <[email protected]> CommitDate: 2021-06-30 07:24:33 +0000 pkgbase: Move ctld/ctladm to iscsi package While here only compile both of them if WITH_ISCSI is set (this is the default). Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D30755 Sponsored by: Diablotin Systems --- usr.sbin/Makefile | 4 +--- usr.sbin/ctladm/Makefile | 1 + usr.sbin/ctld/Makefile | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 259ab72f2281..a961d0626568 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -15,8 +15,6 @@ SUBDIR= adduser \ clear_locks \ crashinfo \ cron \ - ctladm \ - ctld \ daemon \ dconschat \ devctl \ @@ -153,7 +151,7 @@ SUBDIR.${MK_INET6}+= rtsold SUBDIR.${MK_INET6}+= traceroute6 SUBDIR.${MK_INETD}+= inetd SUBDIR.${MK_IPFW}+= ipfwpcap -SUBDIR.${MK_ISCSI}+= iscsid +SUBDIR.${MK_ISCSI}+= ctladm ctld iscsid SUBDIR.${MK_JAIL}+= jail SUBDIR.${MK_JAIL}+= jexec SUBDIR.${MK_JAIL}+= jls diff --git a/usr.sbin/ctladm/Makefile b/usr.sbin/ctladm/Makefile index 9f7386bdc36c..c98643b50dcb 100644 --- a/usr.sbin/ctladm/Makefile +++ b/usr.sbin/ctladm/Makefile @@ -2,6 +2,7 @@ .include <src.opts.mk> +PACKAGE= iscsi PROG= ctladm SRCS= ctladm.c util.c ctl_util.c ctl_scsi_all.c .PATH: ${SRCTOP}/sys/cam/ctl diff --git a/usr.sbin/ctld/Makefile b/usr.sbin/ctld/Makefile index 08dcb79d0d84..ec207f024ab1 100644 --- a/usr.sbin/ctld/Makefile +++ b/usr.sbin/ctld/Makefile @@ -5,6 +5,7 @@ CFLAGS+=-I${SRCTOP}/contrib/libucl/include .PATH: ${SRCTOP}/contrib/libucl/include +PACKAGE= iscsi PROG= ctld SRCS= chap.c ctld.c discovery.c isns.c kernel.c keys.c log.c SRCS+= login.c parse.y pdu.c token.l y.tab.h uclparse.c _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all To unsubscribe, send any mail to "[email protected]"
