Date: Sun, 1 Jun 2025 02:10:19 GMT
From: Lexi Winter <ivy@FreeBSD.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject: git: 08419bf19469 - main - don't gate ctl{d,adm} behind MK_ISCSI
Message-ID: <202506010210.5512AJx9034558@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=08419bf194697d08837b0e0cd7ea30e911eec4bf commit 08419bf194697d08837b0e0cd7ea30e911eec4bf Author: Lexi Winter <ivy@FreeBSD.org> AuthorDate: 2025-06-01 02:04:37 +0000 Commit: Lexi Winter <ivy@FreeBSD.org> CommitDate: 2025-06-01 02:08:40 +0000 don't gate ctl{d,adm} behind MK_ISCSI These are no longer specific to iSCSI; always build them. Reviewed by: kevans, jhb Approved by: kevans (mentor) Differential Revision: https://reviews.freebsd.org/D50625 --- libexec/rc/rc.d/Makefile | 8 ++++---- usr.sbin/Makefile | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index d463a0732c52..4696ef223378 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -114,6 +114,10 @@ CONFGROUPS+= CRON CRON+= cron CRONPACKAGE= cron +CONFGROUPS+= CTL +CTL= ctld +CTLPACKAGE= ctl + CONFGROUPS+= NFS NFS= lockd \ mountd \ @@ -263,10 +267,6 @@ CONFGROUPS+= ISCSI ISCSI= iscsictl \ iscsid ISCSIPACKAGE= iscsi - -CONFGROUPS+= CTL -CTL= ctld -CTLPACKAGE= ctl .endif .if ${MK_JAIL} != "no" diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 4b3223df9f1d..c361c1e5866d 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -14,6 +14,8 @@ SUBDIR= adduser \ clear_locks \ crashinfo \ cron \ + ctld \ + ctladm \ daemon \ dconschat \ devctl \ @@ -153,7 +155,7 @@ SUBDIR.${MK_INET6}+= rtsold SUBDIR.${MK_INET6}+= traceroute6 SUBDIR.${MK_INETD}+= inetd SUBDIR.${MK_IPFW}+= ipfwpcap -SUBDIR.${MK_ISCSI}+= ctladm ctld iscsid +SUBDIR.${MK_ISCSI}+= iscsid SUBDIR.${MK_JAIL}+= jail SUBDIR.${MK_JAIL}+= jexec SUBDIR.${MK_JAIL}+= jls
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202506010210.5512AJx9034558>