From nobody Tue Mar 3 14:26:36 2026 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 4fQJ5T0lxKz6TB3L for ; Tue, 03 Mar 2026 14:26:37 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fQJ5S52Vgz3qLL for ; Tue, 03 Mar 2026 14:26:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772547996; 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=W4K0IfhVZEA5Xf5u/iXIxbq/vHwaIFGyNsnCqUpbzIs=; b=KyNI08auhD4ag9YkP7o5zNRRcPSjkcuDuFtOFA54QX5eagtNB2xgqLxQo4+4woGNdwMruK BBsyA97LHusDHS/Xrpg9JGZGVCvWd5r+HN/kHnA2KAKJCXd1lLE16f2ItSZrh0TEDwv9Oa GEJqFlQFJC59BlAMrQb3npxojQ4WGscoTgO4OvZskXvymhaKrs6J/zsqRa5Lhal740r6SW b7bP8BZnzZXVAlzecEnmNNqWqFq9iFAqCa2wMiGN0A/VxkeZ1pD9lr5C/ljDpNQm3TLTys iVzrwF0pWxEw2DGTzdFTU3wNZVTD6BnnwNUqwfxnarMVcx+tqM8LthpD2sGUcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772547996; a=rsa-sha256; cv=none; b=TSvSeIVD4MRFtic1bBamyFE9OGYLNtpMASE7/DObXICRd+SfevFlKBz0ofMKQcmTkuyZL3 w8vLeGcFV/NzxN8ABVHMOkP5DPjDluNMx9ljPzdYdG0AEtQ5z+80v/+abP5dLvQGu1Junt nPDjrRUKH3ReumieOXJSaCdP8+XCI4hgA/ZqCBCtONq4QupzE+GICLIJL3niCzSO2IGPFb iCzFdrydDOylCdv+2Su6QZM4bvNRkzFPfCSBoirRAidY24ZavbrvRAbZ5kOaw2LaS6AcVg Hr/9BFYNcM2zS411tT+v1SfI6tdjAKjHX2pnPMq5abKQjJc1+onItuvU1z43rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772547996; 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=W4K0IfhVZEA5Xf5u/iXIxbq/vHwaIFGyNsnCqUpbzIs=; b=iOIfoB6WC3tG0u1V02idLrnAsoqmkHXM1/wjDmwigr/jApWDmFpBVf79SKsIrDMiWSu64U tpZLHwynIGqRnUwpxqtdczylqra+rJKTvEnyFahj/UEoftzpWZLEZ1MNzKNjioBAYyr+Av CABqP4w5hPQYNr8464HwtBlAMDfiHmFXyktrg4Ca6U5FdYDQHmD0BIlclhlYWPPV6z22Le qsdRIQI+Ga+z7aBKV+sml2R/8FmQwUXZbAACe3UMye62pE8Pdmk390Jbf0hr1sjG4758nq F73cBKgw3+uERvDiw9/b66j/AGaMmop4n9fawdGMtOkg8aoWfJsvBQrqDF+acw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fQJ5S3mnnz1NNv for ; Tue, 03 Mar 2026 14:26:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 23ad6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Mar 2026 14:26:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b6bb2fc77e37 - main - src.opts.mk: Retire BSD_CPIO option 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6bb2fc77e37fcb1efb4f83fcb2965f26b4db705 Auto-Submitted: auto-generated Date: Tue, 03 Mar 2026 14:26:36 +0000 Message-Id: <69a6ef9c.23ad6.116baa11@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b6bb2fc77e37fcb1efb4f83fcb2965f26b4db705 commit b6bb2fc77e37fcb1efb4f83fcb2965f26b4db705 Author: Ed Maste AuthorDate: 2026-02-23 19:36:09 +0000 Commit: Ed Maste 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"