From owner-dev-commits-src-main@freebsd.org Sat Jun 19 15:50:28 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A18A965C2B2; Sat, 19 Jun 2021 15:50:28 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G6gH849gkz3wJb; Sat, 19 Jun 2021 15:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 7808118CED; Sat, 19 Jun 2021 15:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15JFoStQ015440; Sat, 19 Jun 2021 15:50:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15JFoSsP015439; Sat, 19 Jun 2021 15:50:28 GMT (envelope-from git) Date: Sat, 19 Jun 2021 15:50:28 GMT Message-Id: <202106191550.15JFoSsP015439@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: c42e9af5f12e - main - pkgbase: Move ctld/ctladm to iscsi package MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c42e9af5f12ef3da0429aacb91119ea31ef146e7 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Jun 2021 15:50:28 -0000 The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=c42e9af5f12ef3da0429aacb91119ea31ef146e7 commit c42e9af5f12ef3da0429aacb91119ea31ef146e7 Author: Emmanuel Vadot AuthorDate: 2021-06-19 15:49:57 +0000 Commit: Emmanuel Vadot CommitDate: 2021-06-19 15:49:57 +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 12285ad1d1fd..6acef31cc23a 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -15,8 +15,6 @@ SUBDIR= adduser \ clear_locks \ crashinfo \ cron \ - ctladm \ - ctld \ daemon \ dconschat \ devctl \ @@ -152,7 +150,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 +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