From 32cb7794612cf431fdce066493c7db9fedf58345 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Thu, 3 Sep 2020 18:21:58 +0000 Subject: [PATCH] Ensure zpool-features(5) doesn't get removed by make delete-old. Apparently, somewhere in 2012 ZFS-on-FreeBSD moved it from section 5 to 7, but ZFS-on-Linux never did. --- ObsoleteFiles.inc | 2 -- tools/build/mk/OptionalObsoleteFiles.inc | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 2b7eccdc800d..29bef59d9961 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -7605,8 +7605,6 @@ OLD_FILES+=usr/lib/libdisk.a usr/lib32/libdisk.a # 20121230: remove wrongly created directories for auditdistd OLD_DIRS+=var/dist OLD_DIRS+=var/remote -# 20121114: zpool-features manual page moved from section 5 to 7 -OLD_FILES+=usr/share/man/man5/zpool-features.5.gz # 20121022: remove harp, hfa and idt man page OLD_FILES+=usr/share/man/man4/harp.4.gz OLD_FILES+=usr/share/man/man4/hfa.4.gz diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index dc8c7bd61f55..00d0dece967e 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1173,7 +1173,7 @@ OLD_FILES+=usr/sbin/zfsd OLD_FILES+=usr/sbin/zhack OLD_FILES+=usr/sbin/zdb OLD_FILES+=usr/share/man/man3/libbe.3.gz -OLD_FILES+=usr/share/man/man7/zpool-features.7.gz +OLD_FILES+=usr/share/man/man5/zpool-features.5.gz OLD_FILES+=usr/share/man/man8/bectl.8.gz OLD_FILES+=usr/share/man/man8/gptzfsboot.8.gz OLD_FILES+=usr/share/man/man8/zdb.8.gz