From nobody Sun Apr 12 03:16:33 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 4ftbKv1Wqgz6YM3P for ; Sun, 12 Apr 2026 03:16:35 +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 4ftbKt18jWz3Npw for ; Sun, 12 Apr 2026 03:16:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775963794; 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=fgmXeILrdmCjWGrSXNEMuYfwjvG0eT3PRZJt/gtympE=; b=I3f4UmsQMWuLhyXLL0Omc2p1/2K2MNTWWFYv1y66wWqzbzsa0C7N+x9DCHfLBni57qV9Es hfY9tGESSxcvamQZHuaot8xojP2tgYRMKnUhCF8s7W6UUQKfM35uodT07gV5Xc7DwLJPIE 1+6Z2ccDwY1Fh/hG68ffOrtbZiaLDaU00hjK2xtPZw3L5KaxHrzKTQVxi1vfRZ6DxX60YG /2tTVbaIuUzlnh0hJYxPkTwYlZZVpyTKhCqVqRhnKS7xGToGvlPVDR11M0xw8iVRbltT4U O20vIEgHf5JMQzf+zIuP5I21C/je5ncvsAEoUi8EFkAWn8k7/iKVYqDIB15SIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775963794; a=rsa-sha256; cv=none; b=UG4BMDjVfJc7PNWypGNoiLYBR7arPnIqUbxKjj2YD+k/ux+s5ixm5LMDGfX6valufbzQo0 S9kO0W4xXmTYl4njioF4Dvv9AqWWT/Yz41PF0PPi7WgcFc97b+DHBPCMWcZUT7PCl8bHg8 kguA7liG7s8XBzWZNeMsc4QgfGMEXdcQEIGIxuiCDz6YTXmNEQHDgK+gfeLQ6NggBJTyv9 Z1EYR9023+77qvfqxVwUZ8a9PjAZXLKFpSIGc/zGYxxSdKrz3myTbl1XNMUWQKkyWD9wGk W2CxPrbl6apytzV9cks4OgKWfXBIijd7Ll5Kc350kdlNKUFgZRoKPg7sLogD/A== 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=1775963794; 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=fgmXeILrdmCjWGrSXNEMuYfwjvG0eT3PRZJt/gtympE=; b=dR6+kG0Kp6xBl1aSeoH5Qzc/w2WwBLhc8qmkpY3Fwf/tkbG3qK69u262JDZGQ12PMayLVM BmuHqtKjjzqNZyf2EEOlRn2PHt6OYYfUWOL/tyb9XG1eRRUcH/OaQuk/RDzrmWlxJZkOx0 NX6nnGlkhK8niRAKRGgDIYLf9Fhg6REqRtJAjTEixpYgEpLkD4V8ygMC7H0M0I1O6Rs0Af H7THjEujfUrhgcAFRy1yzZqpXGdjNDHvjO3+FwPlwoOInqUdURUqSu8TGB8YGxjnecTw71 3NnoDnbc/rZOhco6WqgQGQlpQKXFW39R9OtOj5k686Lpi++7YonCnDCGnQ7Rxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftbKs6Xqmz10GY for ; Sun, 12 Apr 2026 03:16:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4763e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 03:16:33 +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: 07ce8141554b - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 07ce8141554b3df7ac9135135039b508f8e3a6b8 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 03:16:33 +0000 Message-Id: <69db0e91.4763e.3eaad99c@gitrepo.freebsd.org> The branch stable/15 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=07ce8141554b3df7ac9135135039b508f8e3a6b8 commit 07ce8141554b3df7ac9135135039b508f8e3a6b8 Author: Artem Bunichev AuthorDate: 2026-02-05 03:35:01 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 03:15:13 +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 bea969b77457..6922fe2c5938 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -9248,6 +9248,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 @@ -9333,6 +9334,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