git: 207ab5f4f1eb - main - rc.d/opensm: Only install when MK_OFED_EXTRA is set
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 29 Oct 2024 13:01:27 UTC
The branch main has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=207ab5f4f1ebcbfd6f3f2ab619baf08862d0d08d
commit 207ab5f4f1ebcbfd6f3f2ab619baf08862d0d08d
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-10-29 13:01:00 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
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