From nobody Tue Nov 14 16:51:57 2023 X-Original-To: dev-commits-src-main@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 4SVC4s4D2Fz51Vdr; Tue, 14 Nov 2023 16:51:57 +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 4SVC4s3l9mz4KhZ; Tue, 14 Nov 2023 16:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699980717; 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=QKhjSGfiKwvTjgTppj1nqSAt0Xok4fUZWVimvI3W4N8=; b=CCbrBZLPjCOEPVfXc59uAYnspsitJLQJEI0AxpARie/6p6fjpLP5yoVLG0CUuUy29cp0S2 KSsQ0iKZoh7M4TtDQnoF5LI8J3M/MDHQxQ/egWaB9T2PnQSfjhvmT2vhBCW7TJ5H/lhAFj jbmAIcuu7PZ0l1ycFmTZNIwmS3O/0tYgOBJ8Rt5K452BDANxGZvGVi/Fyu+4Fx3whk4UHU ERSm/kJ/JxNsQiIhq3t3DW99RCVT/7Lfa0G6Kq38qm9nu0AVZrA3S5qQPWnygSCQUMBcm2 j5GTe5uNDrkfjPIXousVE/lZMl7muJXtbPN7SrYvh6/aMtJw/cMBFts8Ef93VA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699980717; 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=QKhjSGfiKwvTjgTppj1nqSAt0Xok4fUZWVimvI3W4N8=; b=Ar9Ha92IazjTGAw48UI1PejKl4qy6BNnGwVxH+pTXeCnH7fpCvB+0rEesjJW/JUlGwkL9u axRtCCbNV6EWMph+1SOYmDw+Z6tS+MuiGNyL70lz96BDZZWB3hclAitoqNki0Gsah5pzHi xi1M6ZAUOjGmPIDzgZflx+iGkfrBBbnu2UAZJaVNccy5gghOconbMLEutY/4QKCph1Ar/h vTnRk1ZVMKu3whntsIFqceSg+k3MDnX3ZUCshYP/q333vMrkq3cUho1CEkr6Tl8whdIqvl ztugHTiOuuZSyKCl+Cph4JlEFVvb2BG1n8SQaS/I9NFkbXCNavrK0JM246j0nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699980717; a=rsa-sha256; cv=none; b=Z9p+ITFzXxyvHOb3vpM0x0cBzrtH63BZ2tmJVYJAhIJ37oTR5cUFJ0Kd5O8udyVLhbu243 yU5iilo/i9aiHqOIV1GjuYIpazUujIU8bEL7j0KVPMzUCK8U80+A6Bdozs5ngPMVK+2BIU nhctvKFKUvZbsN5PmcD/errfOHIPHoldFuf1iiNLsTZPvQL0AzWvDBE09SP19LApY48Z2z tbmpdJFe61N3yQ5ShPG2P8Z2Y/Fm2wdVivVJapT4lbJlDA0hzcTPFGstYEAmBc4KmdQYOm 8p70aTvCfCJz3GhFWH2CsD4ze2R49pz9jabctEmHM2AolFj1MwpuXNaolR2BFQ== 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 4SVC4s2s5GzwZF; Tue, 14 Nov 2023 16:51:57 +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 3AEGpvJl015751; Tue, 14 Nov 2023 16:51:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AEGpvdD015748; Tue, 14 Nov 2023 16:51:57 GMT (envelope-from git) Date: Tue, 14 Nov 2023 16:51:57 GMT Message-Id: <202311141651.3AEGpvdD015748@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 4ca5df80393e - main - Sort MK_BSD_CPIO before MK_BSDINSTALL List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 4ca5df80393e1f2bf6ac26af42fc7246acb59f71 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=4ca5df80393e1f2bf6ac26af42fc7246acb59f71 commit 4ca5df80393e1f2bf6ac26af42fc7246acb59f71 Author: Brooks Davis AuthorDate: 2023-11-09 00:54:22 +0000 Commit: Brooks Davis CommitDate: 2023-11-14 16:49:41 +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 --- 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 5335e5ea4ffc..f00c1b26a82c 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -395,13 +395,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 @@ -440,6 +433,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