git: b6bb2fc77e37 - main - src.opts.mk: Retire BSD_CPIO option

The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=b6bb2fc77e37fcb1efb4f83fcb2965f26b4db705

commit b6bb2fc77e37fcb1efb4f83fcb2965f26b4db705
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2026-02-23 19:36:09 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2026-03-03 14:25:53 +0000

    src.opts.mk: Retire BSD_CPIO option
    
    Prior to commit 6973701a00e3 ("1. Make the BSD version of cpio the
    default [1]") GNU cpio was installed unconditionally.  The BSD_CPIO
    option was added when we introduced the BSD licensed, libarchive-based
    cpio, to support installation of GNU cpio, libarchive cpio, or both.
    
    GNU cpio was removed long ago and there is no longer a need for this
    option.  We can just install BSD cpio unconditionally.
    
    Reviewed by:    des
    Sponsored by:   The FreeBSD Foundation
    Differential Revision: https://reviews.freebsd.org/D55467
---
 share/man/man5/src.conf.5                | 5 +----
 share/mk/src.opts.mk                     | 1 -
 tools/build/mk/OptionalObsoleteFiles.inc | 7 -------
 usr.bin/Makefile                         | 2 +-
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index ead1a7cf3148..9b185e77c126 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1,5 +1,5 @@
 .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman.
-.Dd February 13, 2026
+.Dd March 3, 2026
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -296,9 +296,6 @@ Do not build
 .Xr bsdinstall 8 ,
 .Xr sade 8 ,
 and related programs.
-.It Va WITHOUT_BSD_CPIO
-Do not build the BSD licensed version of cpio based on
-.Xr libarchive 3 .
 .It Va WITHOUT_BSNMP
 Do not build or install
 .Xr bsnmpd 1
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index bd282224ea65..4abe1c699b4e 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -71,7 +71,6 @@ __DEFAULT_YES_OPTIONS = \
     BOOT \
     BOOTPARAMD \
     BOOTPD \
-    BSD_CPIO \
     BSDINSTALL \
     BSNMP \
     BZIP2 \
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 648d0d3b297d..c915da8ca501 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -452,13 +452,6 @@ 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
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index de422170be1a..0c9c66748269 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -24,6 +24,7 @@ SUBDIR=	apply \
 	comm \
 	command \
 	compress \
+	cpio \
 	csplit \
 	ctlstat \
 	cut \
@@ -185,7 +186,6 @@ SUBDIR=	apply \
 SUBDIR.${MK_ACCT}+=	lastcomm
 SUBDIR.${MK_AT}+=	at
 SUBDIR.${MK_BLUETOOTH}+=	bluetooth
-SUBDIR.${MK_BSD_CPIO}+=	cpio
 SUBDIR.${MK_CALENDAR}+=	calendar
 .if ${MK_CLANG} != "no" || ${MK_LLVM_BINUTILS} != "no" || \
     ${MK_LLD} != "no" || ${MK_LLDB} != "no"