From nobody Thu Aug 7 12:37: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 4byRWR62SWz64Dpy; Thu, 07 Aug 2025 12:37: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4byRWR5Lrsz3skV; Thu, 07 Aug 2025 12:37:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754570243; 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=eW+rtix2JLKGCrPoJ69i4+3i/wP31dkZbVdI09ckr9M=; b=bGcob8dvrX8YmHW2UtbAyVllz0jNuACz8Yxja+p7r9+fYgtZxKD4B5siiPEhscSGQmB7oB 65IuMFWUh6McmaaZLJX47NbFvB9fHO+pwvnKdJr5/xINwUC+arM4aRm5G4AQXCw3aHE8fw EHrIlhbxLKfFduckQ4094VDDHHli7ylPiFeq8qHvK0ISWOawOkBGg/NqeP+qktCp+1tb2Z OZx++c9gjsc5mulAL1HpxX6kNh6UjP/b86ti9EHWiS/1VsB9N4vlleFLdKxmWLRigoBI9B COPOR/0gXLYY5Aq8t2IsXCxqRSYKy1EeSG8q0ZMWoTQjVSsUW3viWi/ib5XAFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754570243; 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=eW+rtix2JLKGCrPoJ69i4+3i/wP31dkZbVdI09ckr9M=; b=TBEcvqnvTpviEUbCZ+pCq5DtF4hRrpM7fGE7XHuFp/hrDEdLQtlFrislc+mWufIULoteJV N3N3FBIWYH947lnkDM7/acR9glObb1OmxkT7ixZ/W0Fa9of1lDPizxMiHjmp4meCbFr5n2 qcq96HzxUcqKP9RN+8kcktNJFA/IBrz5xSvvDkdYW7bwTznRXSOe5CpRZVKMezmKSM0o9L GUZelPyejamvVWJ+p0eVOdzDVOT3s7I4Y2/LmHxmVxxn3fP5GPeHYw2pwaorH+9hab1yHE Vef2qGdOQzu9JVWx1MIy95EE6uOLvS0V5kJtbxyX5TGOjm4mpZIt2JJ25gMofA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754570243; a=rsa-sha256; cv=none; b=b7NCYyUXXxEu48Q7S5YgWYCsXQ7CZo7Uca3x5zaMTr7YOiwnd3T/h1MLDTpW9wuBrlllcW ZzySl82FM7lVqijpfsMBDYREeiTYzEtjy9Rw0vva4IH7xdXVwslDqgiozsCv8j/5WGGwEa to07/+irhjeu+0dVWx3JQLJdloMGbgwGUM8Xf/ze/iV/jTPdt3dYiKYKan6tFNIfBeAHoy ir5igJLc2sQLIfq94h7i+0CGg1FojUSHysKrpRDz5HeN6OE+w0tvPYHGYQAH7R220FfQvK adcFs6tWbK7Te+2i4Q0ggu9fYCcVfIv9On+uU8eabu7gn+/W3REn5vLCWrEwjg== 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 4byRWR4lhcz15t4; Thu, 07 Aug 2025 12:37: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 577CbNIP023732; Thu, 7 Aug 2025 12:37:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 577CbND5023729; Thu, 7 Aug 2025 12:37:23 GMT (envelope-from git) Date: Thu, 7 Aug 2025 12:37:23 GMT Message-Id: <202508071237.577CbND5023729@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: 3958a0eb7efd - main - 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/main X-Git-Reftype: branch X-Git-Commit: 3958a0eb7efdea1e76137a0b8da55af7af4d4738 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=3958a0eb7efdea1e76137a0b8da55af7af4d4738 commit 3958a0eb7efdea1e76137a0b8da55af7af4d4738 Author: Lexi Winter AuthorDate: 2025-08-07 11:44:38 +0000 Commit: Lexi Winter CommitDate: 2025-08-07 12:36:59 +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 --- 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 d92a359ec367..4ddc910c891e 100644 --- a/share/misc/Makefile +++ b/share/misc/Makefile @@ -2,8 +2,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 @@ -15,4 +16,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 58ca2a49b801..aa6d04f1cc43 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1639,6 +1639,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