git: 07ce8141554b - stable/15 - OptionalObsoleteFiles: Add etc/zfs/compatibility.d

The branch stable/15 has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=07ce8141554b3df7ac9135135039b508f8e3a6b8

commit 07ce8141554b3df7ac9135135039b508f8e3a6b8
Author:     Artem Bunichev <tembun@bk.ru>
AuthorDate: 2026-02-05 03:35:01 +0000
Commit:     Kyle Evans <kevans@FreeBSD.org>
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