From nobody Sat Aug 23 00:11:23 2025 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 4c7yCH3NSRz65Rdb; Sat, 23 Aug 2025 00:11:23 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c7yCH1hd2z3ZmH; Sat, 23 Aug 2025 00:11:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907883; 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=mwABlM09PqVbGaqgsngyHfXwhofEGrAX2rKj5CYQWLc=; b=NnulDcpoQH3q8PfiJf+ly4ZS2EHfmICnPm5mSxToHombhD22XeyVDSLSuFk9YwAMTtKmsa IS803uskKDHz52YowneJUtyvKV8mnQNJsOkYcdP8DuiBMrXlzbaGPOu3NXja14YqXfx4NV 8TmQj0ebx9Mn53DkiYt5vAqIeucuCMKT7FU09GmLJWY/DlI3rLqhCf5TVwKjr1mBEbHo2B Ut4+oZcFFEYHNZ2ptXeElEYEG3b0F0Mn5+KNAUPhdMV/B7HevI9Z7Kxc9CVjMER7/woEXG DrhD76mH58Yn+/MVKHxTKWQd4pfjXXELVtuWfY6iJcpkOyNMuFd2BRrFwS+jNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755907883; 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=mwABlM09PqVbGaqgsngyHfXwhofEGrAX2rKj5CYQWLc=; b=QuB359pEYEeHRE7a0q/iTY6hMk5TGb+7cbeqCV4YXYbskcUhZoa3FGDG4LD3hxGF44LhDo VLy+/1b+vYi3iFT7Vavy9S5nsD5OsZQPSFXji9Y1FGCiXUDgpmAnZ1J6LrYNhuExlmodW+ MrwDl3fwTmy46zNpPMDwjOC4dy+SUkP8qjCP8auBFEW2GJ0ya39FbQKu96afz7GO1G/Mhy 8X/hBBfzehVJF6gqOCTqgEG8alwpS7P90nBDDb9ueSdjeFlyIxEdYhrl4IsoBBXcQYApGp 2FAR4wCYTPNx5GIf5guboNkrX9JvxUw6JypDRrNx+WJycroLZ+7asIWbqCEclA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755907883; a=rsa-sha256; cv=none; b=Vq0sepawmR9/OS9yDKCKrvoVxQJ++l4J0g6aE1g5HOS33g8wk9aaCTdsJ93lSXU09OH72u bBURnpZ8OFk8hUnsUIeH47C8oObL3B3Fc4xhN4FUupWitXA6JxIK5qzsD2zVmc/DuIUh9s CSqlY7xbfbA4R5S4rUGP8eNGGdLLyhMhDUgNh9oKdIPdARIkKiIWjJyWpelHIjY+hrVnR9 tgI3FO9W+fH0tcqARYu46hEVvnrTdESmF+cCazWaXXsqsJEoj1NEwNjSuOtgJXdkO0j1vf XvYpW3r7nnxQnL1/owCfKqUgqVJRDn5HNq12eLgUAF8pXBiWf/kotZZVJH1wZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4c7yCH1G0Fz174V; Sat, 23 Aug 2025 00:11:23 +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 57N0BNNv099626; Sat, 23 Aug 2025 00:11:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57N0BNQb099602; Sat, 23 Aug 2025 00:11:23 GMT (envelope-from git) Date: Sat, 23 Aug 2025 00:11:23 GMT Message-Id: <202508230011.57N0BNQb099602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 5c4e9a10334b - stable/14 - share/misc: Move init.ee to the correct package 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5c4e9a10334b3c59f5d9f9d262ad3fa1a746b00d Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=5c4e9a10334b3c59f5d9f9d262ad3fa1a746b00d commit 5c4e9a10334b3c59f5d9f9d262ad3fa1a746b00d Author: Lexi Winter AuthorDate: 2025-08-07 11:44:38 +0000 Commit: Lexi Winter 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 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