Bug 256852

Summary: While `make installworld` installs /usr/share/man/man7/zpool-features.7.gz, `make delete-old` suggests to remove it
Product: Base System Reporter: Yasuhiro Kimura <yasu>
Component: binAssignee: Martin Matuska <mm>
Status: Closed FIXED    
Severity: Affects Many People CC: dim, emaste, grahamperrin, mm
Priority: ---    
Version: CURRENT   
Hardware: Any   
OS: Any   

Description Yasuhiro Kimura freebsd_committer freebsd_triage 2021-06-27 00:18:19 UTC
Summary explains everything.

----------------------------------------------------------------------
yasu@rolling-vm-freebsd1[1012]% uname -a
FreeBSD rolling-vm-freebsd1.home.utahime.org 14.0-CURRENT FreeBSD 14.0-CURRENT #0 main-n247573-aa033e0b14f: Sat Jun 26 02:19:29 JST 2021     rootz@rolling-vm-freebsd1.home.utahime.org:/usr/obj/usr/src/amd64.amd64/sys/GENERIC  amd64
yasu@rolling-vm-freebsd1[1013]%
----------------------------------------------------------------------

According to my investigation, `make installworld` installs this file because 'zpool-features.7' is added to MAN variable in /usr/src/cddl/sbin/zpool/Makefile with base 3ff01b231df.

----------------------------------------------------------------------
commit 3ff01b231df
Merge: 345077ccd52 afa7b348455
Author: Martin Matuska <mm@FreeBSD.org>
Date:   Sun Jun 13 11:03:58 2021

    zfs: merge openzfs/zfs@afa7b3484 (master) into main
    
    Notable upstream pull request merges:
      #12149: Multiple man-pages: Move to appropriate section
      #12158: Re-embed multilist_t storage
      #12191: Convert non-libzpool libraries to -fvisibility=hidden
      #12196: Unify manpage makefiles, move pages to better sexions, ...
      #12210: libzutil: import filtering optimisation
      #12212: Remove pool io kstats
    
    Obtained from:  OpenZFS
    OpenZFS commit: afa7b3484556d3ae610a34582ce5ebd2c3e27bba
----------------------------------------------------------------------

And `make delete-old` suggests to remove it because 'usr/share/man/man7/zpool-features.7.gz' is added to OLD_FILES variable in /usr/src/ObsoleteFiles.in with base b9ec6f2ef9d.

----------------------------------------------------------------------
commit b9ec6f2ef9d
Author: Dimitry Andric <dim@FreeBSD.org>
Date:   Tue May 4 05:24:27 2021

    Add a whole bunch of missed obsolete manpages to ObsoleteFiles.inc
----------------------------------------------------------------------

Cc-ing to committers of these 2 commits.
Comment 1 commit-hook freebsd_committer freebsd_triage 2021-06-27 01:00:52 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/src/commit/?id=2be4a7d508b02a980904378ca7c798fdf8c300d5

commit 2be4a7d508b02a980904378ca7c798fdf8c300d5
Author:     Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2021-06-27 00:53:51 +0000
Commit:     Martin Matuska <mm@FreeBSD.org>
CommitDate: 2021-06-27 00:58:15 +0000

    ObsoleteFiles.inc: fixup after zpool-features.7.gz got re-introduced

    PR:             256852
    MFC after:      3 days

 ObsoleteFiles.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Comment 2 Yasuhiro Kimura freebsd_committer freebsd_triage 2021-07-06 19:01:45 UTC
IIUC there isn't zpool-features.7 in ObsoleteFiles.inc of any stable branches. So we need not do MFC of base 2be4a7d508b0. Please re-open this bug report if I have any misunderstandings.
Comment 3 commit-hook freebsd_committer freebsd_triage 2022-06-22 18:43:53 UTC
A commit in branch stable/13 references this bug:

URL: https://cgit.FreeBSD.org/src/commit/?id=50ce252cd50dba549a7ce020f2d537ad992653e0

commit 50ce252cd50dba549a7ce020f2d537ad992653e0
Author:     Martin Matuska <mm@FreeBSD.org>
AuthorDate: 2021-06-27 00:53:51 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2022-06-22 18:42:08 +0000

    ObsoleteFiles.inc: fixup after zpool-features.7.gz got re-introduced

    PR:             256852
    MFC after:      3 days

    (cherry picked from commit 2be4a7d508b02a980904378ca7c798fdf8c300d5)

 ObsoleteFiles.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)