From nobody Sat Dec 02 00:54:51 2023 X-Original-To: dev-commits-src-branches@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 4Shs0C3WbLz52nDV; Sat, 2 Dec 2023 00:54:51 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Shs0C2pnmz3BmH; Sat, 2 Dec 2023 00:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478491; 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=03rF5OMcbfjRC30gnO11TL83jJAh3Jf9e9tv/ZYXFjg=; b=YycM720onHtq9YrdCWHnUZx4U76a5Ba4Tg3ogeUc98FKrCa8ZYrl1wFMvijoWAQ38DnNnD cH9i5e/4OptTZks2Q3yro5tHyxeDVgcPO8TXb1XhzoukN6KtgfosIFmV8jF7uY+QL1Bdyk vB01SCLARG9MMttmyPInDTpDsgSEVg21opDkYlfQmLwmiaT3kc1KISPLWyP2y1WDn/uBnB LJY0BZTk8aDl5dhYglCUm55Tk+01IvZhzN06pPSajv1ddkZgX8WWlCIoAHqdg+3eb9PNBj K/Tj7WUaWoorFSEWSi9IZfoBIBrzCoEprVFhNtQMLHHe2f1/vhRuLyYIaS71Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478491; 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=03rF5OMcbfjRC30gnO11TL83jJAh3Jf9e9tv/ZYXFjg=; b=b0i3ca5vm+2T+G7GwUbcd80Pi9f4W/SadzA4dsq1kh7uOU7e6qwEByaf2s6pgZ2wfIyDUr 21But+Cs0CUsQymsLDbbvlf0IWxIpN8qBMCjQTOedd8R4ph/VHy+xsRVOV9MRQeDqc5B1H /GkVZYhAI8vpyqg4O2d/DrETwAdgdT2yG02d0c7dbBzThk8H4pMJdDnGN3BALgzJKOrdAj aV1rQDM1Ii/bIBiMVwdxxPtU85i1k2MaDuKAkSI8j8krQrMEuwBGULZHrXd0n1jLmn6Ty8 H1dIRWn7plTWo+vRs9eBq+7e2mKhA+rUOeG2l4x5OOJq5SmvxdXA99goPdnjkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701478491; a=rsa-sha256; cv=none; b=JZGihWyWtLE4dmNtk9i1Eid7H3S+VVy4yejlzJxrwyrpPxhT2qcHRUOMUIjDgpBJs8uHEC FI0uuBwsh2zqydvzOGwypUTT9B2ypZjtTs5NKORAegGUpCD1dQQzkfEEf5zBsf8mR/lZYu YXebOYjdU7cyT3vIm8mBBVWn3B4RRBLJwC8LULyaL/wMu5l3BgoANglpy/p7sRWp/klIKN fCYSCETr/gH1WfrjbXVHdhTRbth2ALZpLL/N67MBsCeQeSLY+1v/ZwIOf5XaEIyj40VFax XhYqQ5LWjzfogsPpRgypscgXFt47zBZUACFXzjbi7ZZjkKm5z49OofO9Xz+JZw== 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 4Shs0C1qf9zwcY; Sat, 2 Dec 2023 00:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B20spGb024837; Sat, 2 Dec 2023 00:54:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B20spfe024834; Sat, 2 Dec 2023 00:54:51 GMT (envelope-from git) Date: Sat, 2 Dec 2023 00:54:51 GMT Message-Id: <202312020054.3B20spfe024834@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 19a185085516 - stable/14 - Sort MK_BSD_CPIO before MK_BSDINSTALL List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 19a18508551685628bc725039896b1ac0737dce2 Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=19a18508551685628bc725039896b1ac0737dce2 commit 19a18508551685628bc725039896b1ac0737dce2 Author: Brooks Davis AuthorDate: 2023-11-09 00:54:22 +0000 Commit: Brooks Davis CommitDate: 2023-12-02 00:11:30 +0000 Sort MK_BSD_CPIO before MK_BSDINSTALL Using sort(1) order makes verification of the sort easier. Reviewed by: emaste, imp, netchild Pull Request: https://github.com/freebsd/freebsd-src/pull/896 (cherry picked from commit 4ca5df80393e1f2bf6ac26af42fc7246acb59f71) --- tools/build/mk/OptionalObsoleteFiles.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index b782f8d102b0..56faed2a27f3 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -400,13 +400,6 @@ OLD_FILES+=usr/sbin/bootptest OLD_FILES+=usr/share/man/man8/bootptest.8.gz .endif -.if ${MK_BSD_CPIO} == no -OLD_FILES+=usr/bin/bsdcpio -OLD_FILES+=usr/bin/cpio -OLD_FILES+=usr/share/man/man1/bsdcpio.1.gz -OLD_FILES+=usr/share/man/man1/cpio.1.gz -.endif - .if ${MK_BSDINSTALL} == no OLD_FILES+=usr/libexec/bsdinstall/adduser OLD_FILES+=usr/libexec/bsdinstall/auto @@ -445,6 +438,13 @@ OLD_FILES+=usr/share/man/man8/sade.8.gz OLD_DIRS+=usr/libexec/bsdinstall .endif +.if ${MK_BSD_CPIO} == no +OLD_FILES+=usr/bin/bsdcpio +OLD_FILES+=usr/bin/cpio +OLD_FILES+=usr/share/man/man1/bsdcpio.1.gz +OLD_FILES+=usr/share/man/man1/cpio.1.gz +.endif + .if ${MK_BSNMP} == no OLD_FILES+=etc/snmpd.config OLD_FILES+=etc/rc.d/bsnmpd