From nobody Tue Oct 29 13:01:27 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 4Xd9PN298Pz5bRQq; Tue, 29 Oct 2024 13:01: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xd9PM56fYz46mZ; Tue, 29 Oct 2024 13:01:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730206887; 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=n9qksRRb7ksWjF1W2m6nOjNnhk6x6LSzganzp/+Kf2g=; b=AJag68l+Ncpwu7ODqNgjo4ueFyJVBvH4Kta7E1tU7Na8cJ2Y5Jle5tR2rrPQxTamscYv74 78nvo4sZdQclzK2vcmleuxWLw93sL9hJmnPGgrDlLLuUM+Axi7p6hlUdGfr3gwQc/7u6tZ rUgsU/D1u5jWrtb9E8u7C4EULh2R63khKu4sQsUNdn0iNHfBNNTELUmF2+JSHT9CmuqjQH 3w4YHUqZ3R5yBTCqUDi5eb/w0W3txIF4cwJnrt9mIg3AUI4EMJi+LcBt9DtS/jJAYViN29 HRJ0I+4U/XM8NVRrRM6qlzNeB06Sr44ItDLtR9e17eOD+dmbD8npqSDVJqXlsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730206887; 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=n9qksRRb7ksWjF1W2m6nOjNnhk6x6LSzganzp/+Kf2g=; b=lkDPcM7nbHg5Qq46Op2kiGKH/w/lPy6bZDyW6yblkys5dHzqkjzIOllAAoSBiVHp5J2LWi t919knW2gjOSZPaKwfYTaKBJuPqEQWm4TR9v++uYaOQrhPBBSj0Wx39xZ0O55Nu+KrxvPX 8dL6qT/CUXmORI7w5ltsMZRQWoPBqTGg6Z10etXsfTZq8CEFD6nVUFJKowlQ9Vz180fQ/1 GMcqRZLJRqbq46LbckOSLn/cOcAG+M16JT7mnl8Rqnn/sihXaQBXQR/qiaQDdto7WoSNO9 tJUoqSnZeS9oTaRGpJD/Kzd0wjU5cuP+BWWX36Wr4WeEWkLs9XmUT3xFY/SQRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730206887; a=rsa-sha256; cv=none; b=exQFEBavVtqKGJfd0/vuinlWahVXXlfDHeKoJoeRnXxWxF90xjIQHeZdcXidj//Z8fjFst q+8pe1R5wok7VkJgYhiTI7pAO7z/xbnc2zJmFh8b1Rxg7xkwYptaoRFrdlTazyGqxudkEx D5V/Im+PhkH9agzv8+6yuXEGxqwxYVwAm3XfrQWCOdJW4wK+YjkMjlCDJ4MsYCHNcnKV1D Q6UOfa7ZI5Wo6K/KKKh10lMKU+mD1xOtzbNvmhu5UxiJ6SQ6zskU5mhP6ni3O/7Z5PUJPg N+4itc4tm4eJEMbeqbe551Jrt3IRfrypuempoTv4oJXfFu1gJtk6x4XOdTNqIQ== 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 4Xd9PM4kmXzNqk; Tue, 29 Oct 2024 13:01:27 +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 49TD1RMM076443; Tue, 29 Oct 2024 13:01:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49TD1R3V076440; Tue, 29 Oct 2024 13:01:27 GMT (envelope-from git) Date: Tue, 29 Oct 2024 13:01:27 GMT Message-Id: <202410291301.49TD1R3V076440@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 207ab5f4f1eb - main - rc.d/opensm: Only install when MK_OFED_EXTRA is set 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 207ab5f4f1ebcbfd6f3f2ab619baf08862d0d08d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=207ab5f4f1ebcbfd6f3f2ab619baf08862d0d08d commit 207ab5f4f1ebcbfd6f3f2ab619baf08862d0d08d Author: Mark Johnston AuthorDate: 2024-10-29 13:01:00 +0000 Commit: Mark Johnston CommitDate: 2024-10-29 13:01:00 +0000 rc.d/opensm: Only install when MK_OFED_EXTRA is set opensm itself is only installed when MK_OFED_EXTRA is set, so it only makes sense for the same to be true of the rc script. PR: 257646 Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D47313 --- libexec/rc/rc.d/Makefile | 2 +- tools/build/mk/OptionalObsoleteFiles.inc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index 69a643a248ef..6e2e9d30ef79 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -286,7 +286,7 @@ NTP+= ntpd \ NTPPACKAGE= ntp .endif -.if ${MK_OFED} != "no" +.if ${MK_OFED_EXTRA} != "no" _opensm= opensm .endif diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 5fd46135da0f..da2f0c15d11e 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -6540,6 +6540,7 @@ OLD_FILES+=usr/share/man/man8/ibstat.8.gz .endif .if ${MK_OFED_EXTRA} == no +OLD_FILES+=etc/rc.d/opensm OLD_FILES+=usr/bin/dump_fts OLD_FILES+=usr/bin/ibaddr OLD_FILES+=usr/bin/ibcacheedit