The branch stable/14 has been updated by ivy:
URL:
https://cgit.FreeBSD.org/src/commit/?id=5c4e9a10334b3c59f5d9f9d262ad3fa1a746b00d
commit 5c4e9a10334b3c59f5d9f9d262ad3fa1a746b00d
Author: Lexi Winter <i...@freebsd.org>
AuthorDate: 2025-08-07 11:44:38 +0000
Commit: Lexi Winter <i...@freebsd.org>
CommitDate: 2025-08-22 22:12:19 +0000
share/misc: Move init.ee to the correct package
Also, only install it if MK_EE is enabled.
Reviewed by: manu (previous version)
Differential Revision: https://reviews.freebsd.org/D51787
(cherry picked from commit 3958a0eb7efdea1e76137a0b8da55af7af4d4738)
---
share/misc/Makefile | 10 +++++++++-
tools/build/mk/OptionalObsoleteFiles.inc | 1 +
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/share/misc/Makefile b/share/misc/Makefile
index dc0d5f619240..5f43b616f2f2 100644
--- a/share/misc/Makefile
+++ b/share/misc/Makefile
@@ -4,8 +4,9 @@
.PATH: ${.CURDIR}/../../sys/dev/usb
+FILESGROUPS= FILES
FILES= ascii birthtoken bsd-family-tree committers-doc.dot
committers-ports.dot \
- committers-src.dot flowers init.ee \
+ committers-src.dot flowers \
iso3166 iso639 latin1 mdoc.template operator pci_vendors \
scsi_modes usb_vendors \
organization.dot
@@ -17,4 +18,11 @@ FILES+= usb_hid_usages
FILES+= usbdevs
.endif
+.if ${MK_EE} != "no"
+FILESGROUPS+= EE
+EE= init.ee
+EEDIR= ${FILESDIR}
+EEPACKAGE= ee
+.endif
+
.include <bsd.prog.mk>
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc
b/tools/build/mk/OptionalObsoleteFiles.inc
index 3e78ca88d75e..5ee0f64e4129 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1649,6 +1649,7 @@ OLD_FILES+=usr/bin/ree
OLD_FILES+=usr/share/man/man1/edit.1.gz
OLD_FILES+=usr/share/man/man1/ee.1.gz
OLD_FILES+=usr/share/man/man1/ree.1.gz
+OLD_FILES+=usr/share/misc/init.ee
OLD_FILES+=usr/share/nls/C/ee.cat
OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/ee.cat
OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/ee.cat
