From nobody Sun Apr 12 13:44:24 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 4ftsGJ55Tyz6ZMF3 for ; Sun, 12 Apr 2026 13:44:24 +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 4ftsGJ1GTLz3kqp for ; Sun, 12 Apr 2026 13:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+WHzv27Jg7SYU0NlTxJbrEGWYez+ZsPBc+RMOmdWJl8=; b=wXlMas9gj64gO/45REb17qCGrCk9wC9J/8kpyJpe2kcaBmFivuPfp5PF/Gb/ruguvgeuuJ wTEPRB6KVdUHNyO7fiiV4X/TupdG9CKWgauk1eSeTbLe7zgcH4JX2BzhN0QzEj9nGg8Vgf hLDgqPUBTdknhzqnjgEQ+A9J3BTxGQbVIu+RtxOgKO8WBu2cdoOrD2VA+KIG//uvFY0Fpp Jxyn5Bu9bhPbhW/xwkxsbKEJvo5odinU6pgCg1J8blUkeBnbayXm3tGUrDGhuPz4+XywcX aNkNJC+YCh+4M7a00l+hyZESO7uOW5jg/B8sR8H7xgmoUa/0Z12jUnf4ZzNAuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001464; a=rsa-sha256; cv=none; b=kozuTQhS9dFlLjzsYwXuZilEKa87U64cifdzUIKVAtY9fqi+TSUbClFlxjxhoIg+07yPs/ g5duue7xXRY3+64Y+RQeoHaHTtNw5ELGrvtxugdf0L3uW7IwbK0AzxsG9tQpWCSjM5sBUM zWs4aNIrT1T0V7tRAI4kZaSwavgthkZOm10gxZUmmQi4xJ0SKLJmDxm6130jQuuiBltj/H F++I9vniw+fawdDeqJufI/qQMsGMF7icET+pUTWho8FXdAjz+bIcqCsTq6B1wBlStKCLwA 8mn2iFUQQQNE/7rw0v4htjItDGq0GuW4L3MEVjzMKo7ts9jynRRP8n2r9lXp9g== 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=1776001464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+WHzv27Jg7SYU0NlTxJbrEGWYez+ZsPBc+RMOmdWJl8=; b=GzGHoWujfmH8+9Mih28ngtV/0hdD55RmbV88032fjX4/4RoczV+T+0wa3DG5Ph1DgBhcFg FCZ84HtvOzONhV0TBthYqhOp8q3ZmtG5+aNtSY0UQKGBCmiOxhB6fia6GNrtQbeeheeFaN aGxlulvGvLSbU7wC+THhtYVm2eNsaMUdsoctmRcvUIx4wHdVTjxxMnvtgNcppiRTRGhE6e rovGgqSTUiOEa5b9YEjjYfrJAW/eALnI1ADlNAzNma8/zYk8eDq2WfvDrN+LYEpDfIGi23 N+BllS3FTK6KIOkx6HwWMI3n70MRdzLgr7pgcluriGtfeywlNNaf84q3nE/q/w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGJ0pzYz3jR for ; Sun, 12 Apr 2026 13:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42ef9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Artem Bunichev From: Kyle Evans Subject: git: 4f4669db7040 - stable/14 - OptionalObsoleteFiles: Add etc/zfs/compatibility.d 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4f4669db7040df5d682e2b08ffa9f3f8c8d36a0c Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:24 +0000 Message-Id: <69dba1b8.42ef9.a98fffd@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=4f4669db7040df5d682e2b08ffa9f3f8c8d36a0c commit 4f4669db7040df5d682e2b08ffa9f3f8c8d36a0c Author: Artem Bunichev AuthorDate: 2026-02-05 03:35:01 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:43 +0000 OptionalObsoleteFiles: Add etc/zfs/compatibility.d If the world is built and installed with WITHOUT_ZFS, then make -DBATCH_DELETE_OLD_FILES delete-old-dirs will give the error: > rmdir: /etc/zfs: Directory not empty because /etc/zfs/compatibility.d is still there. While we're here, clean out /usr/share/zfs as well. Co-authored-by: kevans (cherry picked from commit 5c9d988d865cc4ce849507173c0a2e2f399d0f62) --- tools/build/mk/OptionalObsoleteFiles.inc | 58 ++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 0e4f08da2284..7764dfea7f35 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -9273,6 +9273,7 @@ OLD_FILES+=etc/rc.d/zvol OLD_FILES+=etc/devd/zfs.conf OLD_FILES+=etc/periodic/daily/404.status-zfs OLD_FILES+=etc/periodic/daily/800.scrub-zfs +OLD_DIRS+=etc/zfs/compatibility.d OLD_FILES+=etc/zfs/exports OLD_DIRS+=etc/zfs OLD_LIBS+=lib/libavl.so.2 @@ -9368,6 +9369,63 @@ OLD_FILES+=usr/share/man/man8/zfsbootcfg.8.gz OLD_FILES+=usr/share/man/man8/zfsd.8.gz OLD_FILES+=usr/share/man/man8/zfsloader.8.gz OLD_FILES+=usr/share/man/man8/zpool.8.gz +OLD_FILES+=usr/share/zfs/compatibility.d/2018 +OLD_FILES+=usr/share/zfs/compatibility.d/2019 +OLD_FILES+=usr/share/zfs/compatibility.d/2020 +OLD_FILES+=usr/share/zfs/compatibility.d/2021 +OLD_FILES+=usr/share/zfs/compatibility.d/compat-2018 +OLD_FILES+=usr/share/zfs/compatibility.d/compat-2019 +OLD_FILES+=usr/share/zfs/compatibility.d/compat-2020 +OLD_FILES+=usr/share/zfs/compatibility.d/compat-2021 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-11.0 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-11.1 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-11.2 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-11.3 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-11.4 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-12.0 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-12.1 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-12.2 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-12.3 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-12.4 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-13.0 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-13.1 +OLD_FILES+=usr/share/zfs/compatibility.d/freebsd-13.2 +OLD_FILES+=usr/share/zfs/compatibility.d/freenas-11.0 +OLD_FILES+=usr/share/zfs/compatibility.d/freenas-11.1 +OLD_FILES+=usr/share/zfs/compatibility.d/freenas-11.2 +OLD_FILES+=usr/share/zfs/compatibility.d/freenas-11.3 +OLD_FILES+=usr/share/zfs/compatibility.d/freenas-9.10.2 +OLD_FILES+=usr/share/zfs/compatibility.d/grub2 +OLD_FILES+=usr/share/zfs/compatibility.d/grub2-2.06 +OLD_FILES+=usr/share/zfs/compatibility.d/grub2-2.12 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.0-freebsd +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.0-linux +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.1-freebsd +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.1-linux +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.2 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.2-freebsd +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.2-linux +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.3 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.3-freebsd +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.3-linux +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.4 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.4-freebsd +OLD_FILES+=usr/share/zfs/compatibility.d/openzfs-2.4-linux +OLD_FILES+=usr/share/zfs/compatibility.d/openzfsonosx-1.7.0 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfsonosx-1.8.1 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfsonosx-1.9.3 +OLD_FILES+=usr/share/zfs/compatibility.d/openzfsonosx-1.9.4 +OLD_FILES+=usr/share/zfs/compatibility.d/truenas-12.0 +OLD_FILES+=usr/share/zfs/compatibility.d/ubuntu-18.04 +OLD_FILES+=usr/share/zfs/compatibility.d/ubuntu-20.04 +OLD_FILES+=usr/share/zfs/compatibility.d/ubuntu-22.04 +OLD_FILES+=usr/share/zfs/compatibility.d/zol-0.6.1 +OLD_FILES+=usr/share/zfs/compatibility.d/zol-0.6.4 +OLD_FILES+=usr/share/zfs/compatibility.d/zol-0.6.5 +OLD_FILES+=usr/share/zfs/compatibility.d/zol-0.7 +OLD_FILES+=usr/share/zfs/compatibility.d/zol-0.8 +OLD_DIRS+=usr/share/zfs/compatibility.d +OLD_DIRS+=usr/share/zfs .endif .if ${MK_ZONEINFO} == no