diff --git a/UPDATING b/UPDATING --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,11 @@ world, or to merely disable the most expensive debugging functionality 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: Commit e64fe5ad3a23 removed in6_maxmtu and its setter in6_setmaxmtu(). in6_maxmtu is used to store the max IPv6 MTU of all interfaces, diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -260,10 +260,13 @@ .if ${MK_ISCSI} != "no" CONFGROUPS+= ISCSI -ISCSI= iscsictl \ - iscsid \ - ctld +ISCSI= iscsictl \ + iscsid ISCSIPACKAGE= iscsi + +CONFGROUPS+= CTL +CTL= ctld +CTLPACKAGE= ctl .endif .if ${MK_JAIL} != "no" diff --git a/usr.bin/ctlstat/Makefile b/usr.bin/ctlstat/Makefile --- a/usr.bin/ctlstat/Makefile +++ b/usr.bin/ctlstat/Makefile @@ -1,3 +1,4 @@ +PACKAGE= ctl PROG= ctlstat MAN= ctlstat.8 SDIR= ${SRCTOP}/sys diff --git a/usr.sbin/ctladm/Makefile b/usr.sbin/ctladm/Makefile --- a/usr.sbin/ctladm/Makefile +++ b/usr.sbin/ctladm/Makefile @@ -1,6 +1,6 @@ .include -PACKAGE= iscsi +PACKAGE= ctl PROG= ctladm SRCS= ctladm.c util.c ctl_util.c ctl_nvme_all.c ctl_scsi_all.c .PATH: ${SRCTOP}/sys/cam/ctl diff --git a/usr.sbin/ctld/Makefile b/usr.sbin/ctld/Makefile --- a/usr.sbin/ctld/Makefile +++ b/usr.sbin/ctld/Makefile @@ -3,7 +3,7 @@ CFLAGS+=-I${SRCTOP}/contrib/libucl/include .PATH: ${SRCTOP}/contrib/libucl/include -PACKAGE= iscsi +PACKAGE= ctl PROG_CXX= ctld SRCS= ctld.cc conf.cc discovery.cc isns.cc kernel.cc SRCS+= login.cc parse.y token.l y.tab.h uclparse.cc