git: 9a726ef24134 - main - krb5: Move compile_et to /usr/bin as it was with Heimdal
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 05 Aug 2025 16:33:47 UTC
The branch main has been updated by cy:
URL: https://cgit.FreeBSD.org/src/commit/?id=9a726ef241344d5a67bb0c465a43fcf79f94a33f
commit 9a726ef241344d5a67bb0c465a43fcf79f94a33f
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2025-08-01 06:21:42 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2025-08-05 16:33:03 +0000
krb5: Move compile_et to /usr/bin as it was with Heimdal
Fixes: ee3960cba106
---
ObsoleteFiles.inc | 3 +++
krb5/util/compile_et/Makefile | 4 ----
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 0a4a7a073dcf..6308e51331b0 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -59,6 +59,9 @@ OLD_FILES+=lib/libopencsd.so.0
OLD_FILES+=usr/lib/libopencsd.a
OLD_FILES+=usr/lib/libopencsd.so
+# 20250801: Move compile_et to /usr/sbin
+OLD_FILES+=usr/share/et/compile_et
+
# 20250728: zfsboot (MBR) removed
OLD_FILES+=boot/zfsboot
OLD_FILES+=usr/share/man/man8/zfsboot.8.gz
diff --git a/krb5/util/compile_et/Makefile b/krb5/util/compile_et/Makefile
index 03446f2d7d1c..3d48b39cab27 100644
--- a/krb5/util/compile_et/Makefile
+++ b/krb5/util/compile_et/Makefile
@@ -19,10 +19,6 @@ BINDIR?= /usr/bin
MAN= compile_et.1
CLEANFILES= compile_et
-.if !defined(BOOTSTRAPPING)
-SCRIPTSDIR= ${SHAREDIR}/et
-.endif
-
compile_et: compile_et.sh
sh ${SRC_ETDIR}/config_script ${SRC_ETDIR}/compile_et.sh \
"${KRB5_ETDIR}" /usr/bin/awk /usr/bin/sed > ${.TARGET}