From nobody Wed May 28 01:16:40 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b6Wmn0bs2z5wgYt; Wed, 28 May 2025 01:16:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b6Wmm6n6gz4GB2; Wed, 28 May 2025 01:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748395001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1bJ9r3h91eYJFqpMDz+XLGiMAboifmc8sAoKEeREw64=; b=qW1Cy0QgykshwXjygZM6403+M/okQI4sc1FM9G85nvvnoh9CAbaGak2M3DBimu8NIcJ1lX G5I1CX4MBOdcatvPsiV014Ddzs1hyL3RkRNiQ1P39CyszvIS0oM1hDGNQbbhhcXHUOt/3o RzHBbqPukSOhaNkhNHbpZpRPVeDGzALT+Vj6NN9Lu3Vpm+rQ1PtcYeFaV5Xvt10LnYOjq5 Z5Ll31Wbia5+k/I1uUxzSmMwQ0BAa7GERIX8DKZqw8EpGl35GE+Zh82F5il1TmW6Eq2jPI WqJLQfpn9mnpOOUs8/pEWuIh2NuWtM7vczMEETiV5/6m84kOa5NOIQEnibkgig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748395001; a=rsa-sha256; cv=none; b=GOEujDApee9njYFYZRY9etna9/by5OMjS6pqBvp/wQHhFq4XHisc5Fis7x3hjf6NjoKQ/4 989joL4DCEYfBxOJZZkH4hnnb/2MrAj5TWrrbzk/Hu0XLuKbvBZtOqrlu5pY9oR2amWZm3 UPXnaCkCNCUT0EwTni1DQwsc5v0vpAtQeH9xSd7toJJ//ey+freMa3aAGiT0kphZAqupUr ov2F0oV0dE6BQAKrT2tSVljHgPpe6+NKl7LtGpgRQRPDfPNBME5GNCxyY5jITkUX3pdezE K4jG/O5ru8Y69wOBKWT2G8ja0eWXL+eJlU8XwC9O6eFUTnGmM75PwBOTnWEtJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748395001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1bJ9r3h91eYJFqpMDz+XLGiMAboifmc8sAoKEeREw64=; b=FjaXlzr3G2Te7yFHGW5hSvbznwUmP1S3vFOvf/XeqcUZwjjEm9jyhcv/Wl2/lfzZw1sWb9 lCZ5yUlKaOfKExd7cgoZv6bkvxVElBSqfpG8afZ07kEzdlvxy8UDVOrLiGs3z7rbsRtdpJ 59pkXSf11TSh9ZsFzhCjerbx3Jx4aEwkpZkdreKluWGnNBwhLlzHtJimYmJHvkYxK0C4o3 2S2k4MgElDaZl5cR13WbgihhpsUjnUnhWZwfjxO9rMI8ICDsqQC7nVU8wbNtjXMHQYGLWi qpg+aYxsr5wyHQ0Hr5kZm7+vpwvFT2e06rk1lIVYgFMFhY7X9FuONV68sbJCmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b6Wmm5VPpz1rp; Wed, 28 May 2025 01:16:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54S1Ge4k030866; Wed, 28 May 2025 01:16:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54S1Ge9A030863; Wed, 28 May 2025 01:16:40 GMT (envelope-from git) Date: Wed, 28 May 2025 01:16:40 GMT Message-Id: <202505280116.54S1Ge9A030863@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 76a612526c84 - main - packages: move ctl{d,stat,adm} to the ctl package List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76a612526c8477188f41825346f99a8382e70543 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=76a612526c8477188f41825346f99a8382e70543 commit 76a612526c8477188f41825346f99a8382e70543 Author: Lexi Winter AuthorDate: 2025-05-27 07:17:21 +0000 Commit: Lexi Winter CommitDate: 2025-05-28 01:16:29 +0000 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 --- UPDATING | 5 +++++ libexec/rc/rc.d/Makefile | 9 ++++++--- usr.bin/ctlstat/Makefile | 1 + usr.sbin/ctladm/Makefile | 2 +- usr.sbin/ctld/Makefile | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/UPDATING b/UPDATING index c492082383f8..7efea1207e11 100644 --- a/UPDATING +++ b/UPDATING @@ -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 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 index 67786672351a..d463a0732c52 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -260,10 +260,13 @@ NATDPACKAGE= natd .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 index aa7c6f2a2641..e1cf3a1f142f 100644 --- 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 index 7d2ec477a4f3..9f9ade18934b 100644 --- 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 index 79c69c95fbb1..314554a99b56 100644 --- 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