src.opts.mk: Retire BSD_CPIO option
Prior to commit 6973701a00 ("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
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -71,7 +71,6 @@ __DEFAULT_YES_OPTIONS = \
|
||||
BOOT \
|
||||
BOOTPARAMD \
|
||||
BOOTPD \
|
||||
BSD_CPIO \
|
||||
BSDINSTALL \
|
||||
BSNMP \
|
||||
BZIP2 \
|
||||
|
||||
@@ -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
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user