From nobody Sat Dec 2 00:54:54 2023 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 4Shs0G5x1nz52n7s; Sat, 2 Dec 2023 00:54:54 +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 4Shs0G545Yz3ByV; Sat, 2 Dec 2023 00:54:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478494; 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=dfeqO4RoyKfhw1ubvk9NROff2WkeVHxdrHwvYzk4mAY=; b=Xkdy8/xtGonLAp7xir1MHhk+csrKDPsAaYTUpR+r1TN22RDDDkM6m0723F6WRgYDI9TNu4 MOeadWr0sq/eBW5XmvHIVR82wTcpUFf79UsjpSsIavk+CumE2YCAC7/nFz6xGkxkJZfB6t 6hbFM+ygz/cGVGIS7joqvtZoxyImdHSYr8ecVXHIXEj4XxmtJZITUryIhj+K0gwVfjvgS3 Vpx7gga7+62twSn9r4H4T4Fa0f+gO5oCEy2HZnf2KADd491cCDciD/YaA0N0rCJSKbv18R aT2UpvFLTRD/U26uNVRpnyS1WLBM2W6CwxTMP1S02yp8/2/mSWJ1oKZb152rDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701478494; 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=dfeqO4RoyKfhw1ubvk9NROff2WkeVHxdrHwvYzk4mAY=; b=Y6yv/HlyWkq52NKeonCKXcukfO6R8+ehQnicFw5X6beqiafBu+0t/id5bB7MudGmi4BsKk lkfkLfjKpriabsoXXT8jIblG8dhhx2LwDPGNERyJFTwxAlV+AoEkYViHL3eEt/5vJSrSj3 6y+iYJ+lB6dKcdLWhBO7TesecAdSy+xmIBJbNmZV+XN1qLPeoAucBs7Uaf8H5IUPfPnQfj YiLEvsrZ8FhNRIfJ4c/81JBvPHlsVlEz4H1Seh32/U+0n6S4hzxU17ihQcX/KqrD2uyhdP LEWmIlxWEU+DLrQKYN+hYgmCa/DM0ExaoE2UAv1UaQrgUX8ntIUfEMUiNH5ubw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701478494; a=rsa-sha256; cv=none; b=Vk7ASzsivbuQebC4ysICpGrIQHLyzKIR1hhi1e+yfPnV9q+ZEEriWN9nPrSgUJo6nJPvdk KOX37tcvbz2Np45RCb+Q9F0+nmQjCWmojDEUP7E3arhPt2dK0q+bx4TAqoHvu7T+1O3g24 KYDo5S0TRCxRfDj2BVA86xrxLMSPM+Vg6eJOLu0Qo0mkLj7Az+4r04oS8oPGtEXpNQ1l0Q XcSFlC2V/avvLDO+fqbjDPNylIlpWJlagV7INpYxyzYTf5lYrRLLNpMk5atP+inENSUA/w pWJIm4iGNQdI0+UcKW+jUv25YsqHKHT71TDa+jtQOnrktnj1xAbu033kcGDgfg== 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 4Shs0G49vzzwSd; Sat, 2 Dec 2023 00:54:54 +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 3B20ssfV024959; Sat, 2 Dec 2023 00:54:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B20sseP024956; Sat, 2 Dec 2023 00:54:54 GMT (envelope-from git) Date: Sat, 2 Dec 2023 00:54:54 GMT Message-Id: <202312020054.3B20sseP024956@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: cd9af23a9cc8 - stable/14 - Sort MK_EFI and MK_FTP options 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: cd9af23a9cc8a3fe77ecaafdd349209fabc3042c Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=cd9af23a9cc8a3fe77ecaafdd349209fabc3042c commit cd9af23a9cc8a3fe77ecaafdd349209fabc3042c Author: Brooks Davis AuthorDate: 2023-11-09 00:59:43 +0000 Commit: Brooks Davis CommitDate: 2023-12-02 00:11:31 +0000 Sort MK_EFI and MK_FTP options Reviewed by: emaste, imp, netchild Pull Request: https://github.com/freebsd/freebsd-src/pull/896 (cherry picked from commit 16743f0e0b1567b38e5071814d61c04b557bcaa0) --- tools/build/mk/OptionalObsoleteFiles.inc | 52 ++++++++++++++++---------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index d6c1d2ba0a22..f9867f8814a0 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1379,32 +1379,6 @@ OLD_DIRS+=usr/share/bsdconfig/timezone OLD_DIRS+=usr/share/bsdconfig/usermgmt .endif -.if ${MK_EFI} == no -OLD_FILES+=usr/sbin/efibootmgr -OLD_FILES+=usr/sbin/efidp -OLD_FILES+=usr/sbin/efivar -OLD_FILES+=usr/sbin/uefisign -OLD_FILES+=usr/share/examples/uefisign/uefikeys -.endif - -.if ${MK_FTP} == no -OLD_FILES+=etc/ftpusers -OLD_FILES+=etc/newsyslog.conf.d/ftp.conf -OLD_FILES+=etc/pam.d/ftp -OLD_FILES+=etc/pam.d/ftpd -OLD_FILES+=etc/rc.d/ftpd -OLD_FILES+=etc/syslog.d/ftp.conf -OLD_FILES+=usr/bin/ftp -OLD_FILES+=usr/bin/gate-ftp -OLD_FILES+=usr/bin/pftp -OLD_FILES+=usr/libexec/ftpd -OLD_FILES+=usr/share/man/man1/ftp.1.gz -OLD_FILES+=usr/share/man/man1/gate-ftp.1.gz -OLD_FILES+=usr/share/man/man1/pftp.1.gz -OLD_FILES+=usr/share/man/man5/ftpchroot.5.gz -OLD_FILES+=usr/share/man/man8/ftpd.8.gz -.endif - .if ${MK_DICT} == no OLD_FILES+=usr/share/dict/README OLD_FILES+=usr/share/dict/freebsd @@ -1594,6 +1568,14 @@ OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/ee.cat OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/ee.cat .endif +.if ${MK_EFI} == no +OLD_FILES+=usr/sbin/efibootmgr +OLD_FILES+=usr/sbin/efidp +OLD_FILES+=usr/sbin/efivar +OLD_FILES+=usr/sbin/uefisign +OLD_FILES+=usr/share/examples/uefisign/uefikeys +.endif + .if ${MK_EXAMPLES} == no OLD_FILES+=usr/share/examples/BSD_daemon/FreeBSD.pfa OLD_FILES+=usr/share/examples/BSD_daemon/README @@ -1954,6 +1936,24 @@ OLD_FILES+=usr/libexec/phttpget OLD_FILES+=usr/share/man/man8/phttpget.8.gz .endif +.if ${MK_FTP} == no +OLD_FILES+=etc/ftpusers +OLD_FILES+=etc/newsyslog.conf.d/ftp.conf +OLD_FILES+=etc/pam.d/ftp +OLD_FILES+=etc/pam.d/ftpd +OLD_FILES+=etc/rc.d/ftpd +OLD_FILES+=etc/syslog.d/ftp.conf +OLD_FILES+=usr/bin/ftp +OLD_FILES+=usr/bin/gate-ftp +OLD_FILES+=usr/bin/pftp +OLD_FILES+=usr/libexec/ftpd +OLD_FILES+=usr/share/man/man1/ftp.1.gz +OLD_FILES+=usr/share/man/man1/gate-ftp.1.gz +OLD_FILES+=usr/share/man/man1/pftp.1.gz +OLD_FILES+=usr/share/man/man5/ftpchroot.5.gz +OLD_FILES+=usr/share/man/man8/ftpd.8.gz +.endif + .if ${MK_GAMES} == no OLD_FILES+=usr/bin/caesar OLD_FILES+=usr/bin/factor