From nobody Tue Nov 14 16:52:00 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 4SVC4x0l3Yz51VvS; Tue, 14 Nov 2023 16:52:01 +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 4SVC4w67nZz4KjX; Tue, 14 Nov 2023 16:52:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699980720; 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=Xfc5EdMN4j7AfBEBoyKgKWOtxZVcTkTyJqSOvBOpZ74=; b=ZPJGM/bQ8DWxcSiHSqWgwlxcG2QajIwPAwmBkaIMsn1VuWuWyVwVvwY5vuwGTnrVxUt4Zu omZNocgfBvu34ygR7ATC2YLqpAkz6RyclSHUnIKA/u9GD0wOFZKsaXahH7pK5VQKcJVu6H TPDVukOQaVTOR7lh0bgBlXlpLzTfjYt4d5EuSAlndopr9odyxRHGJOhaHbRV8hHWu0x2/G O3iljxTTgXqs+MOUwWz6SGGIrnSFimA9bA75pNHOtkfiaxcX0+0F2tc37IJuSOrT0EELjZ mBou+B9A+M2TEAgToQzxFES4pEFjjORzB5Kc4H6HGuRdmZIFN9I9G927w7uV+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699980720; 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=Xfc5EdMN4j7AfBEBoyKgKWOtxZVcTkTyJqSOvBOpZ74=; b=SpcFwh0tVN3JxUZyWemx3DC6p2+Ac5eWevYPgpD/sieSwpf0aWirz8BR4QweP8LYAPse2O flXikGrO9Qy5OCH4gJeR6CZtv43zpmaNakbLJXNhSsr4Jybz5Ot7KLkmWfeN6VcKM1XmW+ IAuzWkobDEoilkEEi04Znp+Oj4e0U5KftGc+pplcv85xlZhimlGTY2BR+QoE9rOFft9pGe VQvDacfwySOlsuUYQoUVVMNbIDLBtjDPcDfkdl4OBSW8jQeZZr7uLGtkGrCKimHdKPR/2R 26OskXi4Dzlk+70ikStpMYIttrD5WeNjDD1BiaBihVLK/yQp8D/ikECs/JnTFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699980720; a=rsa-sha256; cv=none; b=vN7Kge2wTt9AyiZOkbAvfV7DIapC8Gyvec4d/i4kK7yq4DfqAJUjix4SHEeY5kIZW+GVKf 6nyu9vliBbmsfAreE/ES6S317BeZj6KuA8hxA05Pocn0PRlOiusaiO4FM70CYX7Lvc/Mkz 0FbeASA3axeGpV0re7r173aCvi6IDeuERWA7/5tjeFXN/rz77ptoKI7geAog2yen4OHH69 QyAxpWr4BrNkvrXYQyB1IsVHQ0z2kR1HjsR27pXjXUVqb6hbPhh3n9Ivbfr8BcHQb9mjRJ OaONVuP7D77b0FzXgYpGpyvTFWB6V2EmTVAJuGIF7wi/yj9WIWU3gsZkbr1Y+A== 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 4SVC4w5FMxzwxM; Tue, 14 Nov 2023 16:52:00 +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 3AEGq02O015887; Tue, 14 Nov 2023 16:52:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AEGq0DO015884; Tue, 14 Nov 2023 16:52:00 GMT (envelope-from git) Date: Tue, 14 Nov 2023 16:52:00 GMT Message-Id: <202311141652.3AEGq0DO015884@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: 16743f0e0b15 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 16743f0e0b1567b38e5071814d61c04b557bcaa0 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=16743f0e0b1567b38e5071814d61c04b557bcaa0 commit 16743f0e0b1567b38e5071814d61c04b557bcaa0 Author: Brooks Davis AuthorDate: 2023-11-09 00:59:43 +0000 Commit: Brooks Davis CommitDate: 2023-11-14 16:49:53 +0000 Sort MK_EFI and MK_FTP options Reviewed by: emaste, imp, netchild Pull Request: https://github.com/freebsd/freebsd-src/pull/896 --- 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 d626565acff4..87184f021890 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1364,32 +1364,6 @@ OLD_FILES+=usr/share/man/man3/dialog.3.gz OLD_FILES+=usr/share/man/man3/dpv.3.gz .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 @@ -1579,6 +1553,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 @@ -1940,6 +1922,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