From nobody Thu Feb 5 03:36:17 2026 X-Original-To: dev-commits-src-main@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 4f62vC3Vwzz6R71N for ; Thu, 05 Feb 2026 03:36:23 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f62vB3sc8z3wW0 for ; Thu, 05 Feb 2026 03:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770262582; 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=kUi0z6nfVZdGGzR9yq3OwG61vKSG9uefoXct4uGBukw=; b=IlxudvEM+c+b5T8YwtGdey8RtkiXhJdTVgj8yp/+EpigJFAbnqDadTbPA7z+MiYkybYCYF fLROeewGkEbFVNGIZkXn+fTSaek/Qlz5Mf6SBQ1lRbJ78DO7O0/GQvL8PH4+ptQKoXcevT vZQigrVmg1Heedwlhhg4cYywEModKdkKa1P3MGzGTBJVjtOXW5VzAZTEz1yVh8AIuj5xPZ AAyI6s+RfUC4mHWzMrdfuMY64BNyQJDCvPfcQC7COyEpX0HUs1srlTD7gO46S2yqocS7rG cZFkIS8rbEPmKLx+4mXRwvz/LVR7tk7StnperFWhcZN1VIi+P5q26cRXZ6fFJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770262582; a=rsa-sha256; cv=none; b=oWTA+AhcQ1NZtCquVdaYzynHNDz1T6z336iB1e37UDqO5eUMWZWTXCB+kFljYlELmfTy8i 6hys/z9MO6vRqlxHDAqyW51ScR/3d8zUiDjiCIseCgEIlRe0Dy4Jqy1nGGx2WwQS8qJDYG PZqUhuDYJbk2AZ0RpG3/eF4yJ1UJg9UWiFMAyM4QPswWHmJVOOlp3uQd+EJlfp/KleMYUC d4MhXba7LE+3PUiarclGREZJZwu6wTD2yh1Irk63xA7DBqofHegXxYvye500j9o1OkQGOe 0hI13HMSUn5F2r0x+kvDrR1wU2B0LYA/biwsLqlKj9N1q5LIegzpwGOmQB23KQ== 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=1770262582; 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=kUi0z6nfVZdGGzR9yq3OwG61vKSG9uefoXct4uGBukw=; b=O9jFZ/20b3HwxATfZM5cDhjEZISz/75FR5QZj34vsg6By931KtNbQhgHTED9WU2vzkr+BN nflWoE18pdGaQS+FWUCAvhruZecYuMfXpEnYZfrU1qcXBH42DmuVpZsEYlSvUSMkoHBKEZ xVj/qUUsALzHH6v9JoM+ZVMwQ7jQ4rwTZHzVWkKhdGzPW6Be9DLiBUN7a9JnRst86sOYw1 Hwytqv315XP/o3/5V5OS0BsHpj61pDM2p/SsAkOoBeW4hCKxSVQlwA58hnk+enph+Kmx4L 7dd/o2WdwtBx2ZoTPIPKke8zGJhgvgBOwcJjhGxM/vyHah6bXNTgw+J3dpbTFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f62vB2G8Xz1Qn6 for ; Thu, 05 Feb 2026 03:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45120 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 03:36:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Artem Bunichev From: Kyle Evans Subject: git: 5c9d988d865c - main - OptionalObsoleteFiles: Add etc/zfs/compatibility.d List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5c9d988d865cc4ce849507173c0a2e2f399d0f62 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 03:36:17 +0000 Message-Id: <69841031.45120.cc296cb@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=5c9d988d865cc4ce849507173c0a2e2f399d0f62 commit 5c9d988d865cc4ce849507173c0a2e2f399d0f62 Author: Artem Bunichev AuthorDate: 2026-02-05 03:35:01 +0000 Commit: Kyle Evans CommitDate: 2026-02-05 03:35:01 +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 Differential Revision: https://reviews.freebsd.org/D54758 --- 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 5b0a18f75e9e..aae83a44e53e 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -9250,6 +9250,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 @@ -9340,6 +9341,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