From nobody Tue Apr 23 18:49:13 2024 X-Original-To: dev-commits-src-all@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 4VPB3s725Tz5Hqyp; Tue, 23 Apr 2024 18:49:13 +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 4VPB3s5Znyz4YYS; Tue, 23 Apr 2024 18:49:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713898153; 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=/qFzq3LzTeK1+QgeqTkmJBXeLoMOw50u+Hat4+r54xU=; b=x+3piUK4Gx9nZoavX1WZBZ7uVETKDjFD6+kW+hYzK/7Ro6SvipDfGGsVC8UFItn4TN5zqf T7XI4lwtO0+CoJm2tcSSeR7ixCl8k9eulnbt3N//1ckF8GhYJ2QksmRRZMzmnDpwDmx3HU fiXFpDNEtPk1+hGWOH21hAIJnQGVQ6m0LszZ/GhfWnbEpjMOM8ANYhODbgUUtCp7KJp08J +jMuXCI6+0CgVVqiRel0QA8J02II2DgXClZpCKnZTcUOzMn53fG3k+zGWG02aDR+EeH0Nu QTZ+yJD4AZpfSjaC5Yjj+mw5Hzv1JoPb7IEku1HhfU85GSJUPaqSXix2EnIFRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713898153; a=rsa-sha256; cv=none; b=Prh0w2wP2gXeLquFejlb1M9rPC6Ax/KtVLrmBZNrag/nBCppSyj5FQRMilZLbFpQF7q5cN gAigRA8ALX2fuSD4iq81f0e9szsViunOYXbkaRvkOMyHjCiOWHF+OHKFgtCIIDFS49CJG6 v831/v7RgZrZaBlcl6heYwTVMs841tF8oAwq+siMSXnCSArtkTT5XAaKS0cGHz+sQ6g16b 2iKdDf8FNKZ/SlB3BvCwaTzhDmLDEqizexInlZtqrI1XkBvWcfQi/24IeMN1XFLjPh1d+J ElVEp+stMf4zTlvvzNrakTl+VMfXNkZJnGudcf1IOrfYVG8lVPfGu8cO+frkEw== 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=1713898153; 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=/qFzq3LzTeK1+QgeqTkmJBXeLoMOw50u+Hat4+r54xU=; b=yIVT2dTKgUotEqyl0bhk2Ks+BAYKROIVxaKf44kRC7LyJ7O7YhfChtbpS/4kUKB8l9aO6k R01gFiv8ctJaF9l30MJYG7uc5GPzP02GqNqQHgGjk03XYPmH6qi6DHxwsIgWSCrV25PIVg Bb2NF0CcJFNCuYUvB+M9vHF+m3GyuTPi8/TDpM8FCxvNDpbzpW8brStDkxvRXBE1AxtAw/ AkK9lTjKjz6Jlprl5Orl8PMXeM8RrESRpV9nlnE+0zQ46Qiz7l5xtCdyAnQMWkXC8RViuJ DrjHvIAGgNoxGYyGCUA48//4AOPkcryWLELzPLLqPNHE2PnbKIp65wovlVqn1A== 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 4VPB3s5B39zk2N; Tue, 23 Apr 2024 18:49:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43NInD9A076686; Tue, 23 Apr 2024 18:49:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NInDTE076683; Tue, 23 Apr 2024 18:49:13 GMT (envelope-from git) Date: Tue, 23 Apr 2024 18:49:13 GMT Message-Id: <202404231849.43NInDTE076683@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 2d51a9898e26 - main - nvmecontrol: Always build instead of being conditional on WITH_NVME List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d51a9898e26c87586ba50e71b6b3fdf1591713d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2d51a9898e26c87586ba50e71b6b3fdf1591713d commit 2d51a9898e26c87586ba50e71b6b3fdf1591713d Author: John Baldwin AuthorDate: 2024-04-23 18:47:26 +0000 Commit: John Baldwin CommitDate: 2024-04-23 18:47:26 +0000 nvmecontrol: Always build instead of being conditional on WITH_NVME This now builds fine on all platforms so always include it similar to other tools such as camcontrol. Reviewed by: imp, emaste Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D44842 --- sbin/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/Makefile b/sbin/Makefile index 342f385f090b..200dc9da11c8 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -51,6 +51,7 @@ SUBDIR=adjkerntz \ newfs_msdos \ nfsiod \ nos-tun \ + nvmecontrol \ pfilctl \ rcorder \ reboot \ @@ -77,7 +78,6 @@ SUBDIR.${MK_INET6}+= rtsol SUBDIR.${MK_IPFILTER}+= ipf SUBDIR.${MK_IPFW}+= ipfw SUBDIR.${MK_IPFW}+= natd -SUBDIR.${MK_NVME}+= nvmecontrol SUBDIR.${MK_OPENSSL}+= decryptcore SUBDIR.${MK_PF}+= pfctl SUBDIR.${MK_PF}+= pflogd