Bug 43430

Summary: Documentation incorrect in /usr/src/Makefile
Product: Documentation Reporter: stevedav <stevedav>
Component: Books & ArticlesAssignee: freebsd-doc (Nobody) <doc>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   

Description stevedav 2002-09-27 18:40:02 UTC 
I did a cvsup of the 4.6 RELENG (STABLE) branch and then read
/usr/src/Makefile and found these instructions:

# For individuals wanting to upgrade their sources (even if only a
# delta of a few days):
#
# 1.  `cd /usr/src'       (or to the directory containing your source tree).
# 2.  `make buildworld'
# 3.  `make buildkernel KERNCONF=YOUR_KERNEL_HERE'     (default is GENERIC).
# 4.  `make installkernel KERNCONF=YOUR_KERNEL_HERE'   (default is GENERIC).
# 5.  `reboot'        (in single user mode: boot -s from the loader prompt).
# 6.  `mergemaster -p'
# 7.  `make installworld'
# 8.  `mergemaster'
# 9.  `reboot'
#

There is no '-p' option to mergemaster; it is difficult to understand what conceptually '-p' would have done if it existed.

Fix: 

Fix the documentation.
Also elaborate (a little) as to what the steps achieve. 
I can and did read the mergemaster docs so no need to repeat,
but '-p' isn't in the mergemaster docs.
How-To-Repeat: Have a look at /usr/src/Makefile
Comment 1 Bruce A. Mah freebsd_committer freebsd_triage 2002-09-27 18:46:59 UTC 
If memory serves me right, Steve Davidson wrote:

> There is no '-p' option to mergemaster; it is difficult to understand what co
> nceptually '-p' would have done if it existed.

nimitz:bmah% man mergemaster
MERGEMASTER(8)          FreeBSD System Manager's Manual         MERGEMASTER(8)

NAME
     mergemaster - merge configuration files, et al during an upgrade

[deletia]

     -p          Pre-buildworld mode.  Compares only files known to be essen-
                 tial to the success of {build|install}world, including
                 /etc/make.conf.

[deletia]

nimitz:bmah% uname -a
FreeBSD nimitz.packetdesign.com 4.7-RC FreeBSD 4.7-RC #43: Mon Sep 23 10:08:47 PDT 2002     root@nimitz.packetdesign.com:/usr/obj/usr/src/sys/NIMITZ  i386

Perhaps you have an old, cached copy of the mergemaster manpage?

Bruce.
Comment 2 Marc Fonvieille freebsd_committer freebsd_triage 2002-09-27 18:51:09 UTC 
On Fri, Sep 27, 2002 at 10:39:47AM -0700, Steve Davidson wrote:
> There is no '-p' option to mergemaster; it is difficult to understand what conceptually '-p' would have done if it existed.
> >How-To-Repeat:
> Have a look at /usr/src/Makefile      
> >Fix:
> Fix the documentation.
> Also elaborate (a little) as to what the steps achieve. 
> I can and did read the mergemaster docs so no need to repeat,
> but '-p' isn't in the mergemaster docs.

From man mergemaster:

 -p          Pre-buildworld mode.  Compares only files known to be essen
             tial to the success of {build|install}world, including
	     /etc/make.conf.

Marc
Comment 3 Gary W. Swearingen 2002-09-27 21:13:24 UTC 
Steve Davidson <stevedav@pacbell.net> writes:

> I did a cvsup of the 4.6 RELENG (STABLE) branch and then read
> /usr/src/Makefile and found these instructions:

But you probably didn't cvsup the ports and update mergemaster.
Comment 4 Tom Rhodes freebsd_committer freebsd_triage 2002-10-04 00:42:33 UTC 
State Changed
From-To: open->closed

Closed.  The documentation is fine, perhaps you have an older version?