packages: move ctl{d,stat,adm} to the ctl package

This leaves the iscsi package for the iSCSI initiator, and the new
package provides the CAM target layer (including the iSCSI target).

Reviewed by:	manu, des, jhb
Approved by:	des (mentor)
Differential Revision:	https://reviews.freebsd.org/D50287
This commit is contained in:
Lexi Winter committed 2025-05-28 02:16:29 +01:00
1 parent e623b0dc65
commit 76a612526c
5 files changed
+14 -5

No files matched your search

+5
View File
@@ -27,6 +27,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW:
world, or to merely disable the most expensive debugging functionality world, or to merely disable the most expensive debugging functionality
at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".)
20250527:
ctld(8), ctladm(8) and ctlstat(8) have moved to the new FreeBSD-ctl
package. If you use pkgbase and you need the CAM Target Layer, you
should install the new package.
20250521: 20250521:
Commit e64fe5ad3a23 removed in6_maxmtu and its setter in6_setmaxmtu(). Commit e64fe5ad3a23 removed in6_maxmtu and its setter in6_setmaxmtu().
in6_maxmtu is used to store the max IPv6 MTU of all interfaces, in6_maxmtu is used to store the max IPv6 MTU of all interfaces,
+6 -3
View File
@@ -260,10 +260,13 @@ NATDPACKAGE= natd
.if ${MK_ISCSI} != "no" .if ${MK_ISCSI} != "no"
CONFGROUPS+= ISCSI CONFGROUPS+= ISCSI
ISCSI= iscsictl \ ISCSI= iscsictl \
iscsid \ iscsid
ctld
ISCSIPACKAGE= iscsi ISCSIPACKAGE= iscsi
CONFGROUPS+= CTL
CTL= ctld
CTLPACKAGE= ctl
.endif .endif
.if ${MK_JAIL} != "no" .if ${MK_JAIL} != "no"
+1
View File
@@ -1,3 +1,4 @@
PACKAGE= ctl
PROG= ctlstat PROG= ctlstat
MAN= ctlstat.8 MAN= ctlstat.8
SDIR= ${SRCTOP}/sys SDIR= ${SRCTOP}/sys
+1 -1
View File
@@ -1,6 +1,6 @@
.include <src.opts.mk> .include <src.opts.mk>
PACKAGE= iscsi PACKAGE= ctl
PROG= ctladm PROG= ctladm
SRCS= ctladm.c util.c ctl_util.c ctl_nvme_all.c ctl_scsi_all.c SRCS= ctladm.c util.c ctl_util.c ctl_nvme_all.c ctl_scsi_all.c
.PATH: ${SRCTOP}/sys/cam/ctl .PATH: ${SRCTOP}/sys/cam/ctl
+1 -1
View File
@@ -3,7 +3,7 @@
CFLAGS+=-I${SRCTOP}/contrib/libucl/include CFLAGS+=-I${SRCTOP}/contrib/libucl/include
.PATH: ${SRCTOP}/contrib/libucl/include .PATH: ${SRCTOP}/contrib/libucl/include
PACKAGE= iscsi PACKAGE= ctl
PROG_CXX= ctld PROG_CXX= ctld
SRCS= ctld.cc conf.cc discovery.cc isns.cc kernel.cc SRCS= ctld.cc conf.cc discovery.cc isns.cc kernel.cc
SRCS+= login.cc parse.y token.l y.tab.h uclparse.cc SRCS+= login.cc parse.y token.l y.tab.h uclparse.cc