From owner-freebsd-doc@FreeBSD.ORG Mon Nov 22 10:20:23 2004 Return-Path: Delivered-To: freebsd-doc@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 080A816A4CE for ; Mon, 22 Nov 2004 10:20:23 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D5DC543D5C for ; Mon, 22 Nov 2004 10:20:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.1/8.13.1) with ESMTP id iAMAKM7F072590 for ; Mon, 22 Nov 2004 10:20:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.1/8.13.1/Submit) id iAMAKMvX072589; Mon, 22 Nov 2004 10:20:22 GMT (envelope-from gnats) Resent-Date: Mon, 22 Nov 2004 10:20:22 GMT Resent-Message-Id: <200411221020.iAMAKMvX072589@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-doc@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Brian Candler Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 047A816A4CE for ; Mon, 22 Nov 2004 10:18:02 +0000 (GMT) Received: from boggle.pobox.com (boggle.pobox.com [208.58.1.193]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E86643D39 for ; Mon, 22 Nov 2004 10:18:02 +0000 (GMT) (envelope-from b.candler@pobox.com) Received: from boggle (localhost [127.0.0.1]) by boggle.pobox.com (Postfix) with ESMTP id 13318AE1A2 for ; Mon, 22 Nov 2004 05:18:02 -0500 (EST) Received: from billdog.local.linnet.org (dsl-212-74-113-65.access.uk.tiscali.com [212.74.113.65]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by boggle.sasl.smtp.pobox.com (Postfix) with ESMTP id 7F34541BF11 for ; Mon, 22 Nov 2004 05:18:01 -0500 (EST) Received: from brian by billdog.local.linnet.org with local (Exim 4.43 (FreeBSD)) id 1CWBGi-000O56-FO for FreeBSD-gnats-submit@freebsd.org; Mon, 22 Nov 2004 10:18:00 +0000 Message-Id: Date: Mon, 22 Nov 2004 10:18:00 +0000 From: Brian Candler To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: docs/74231: Conflicting information on mergemaster -p X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Brian Candler List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Nov 2004 10:20:23 -0000 >Number: 74231 >Category: docs >Synopsis: Conflicting information on mergemaster -p >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-doc >State: open >Quarter: >Keywords: >Date-Required: >Class: doc-bug >Submitter-Id: current-users >Arrival-Date: Mon Nov 22 10:20:22 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Brian Candler >Release: FreeBSD 5.3-STABLE i386 >Organization: >Environment: System: FreeBSD billdog.local.linnet.org 5.3-STABLE FreeBSD 5.3-STABLE #3: Thu Nov 18 15:49:59 GMT 2004 root@billdog.local.linnet.org:/usr/src/sys/i386/compile/BILLDOG i386 >Description: The handbook gives inconsistent information about where 'mergemaster -p' fits into the build/upgrade process. http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html In section 19.4.1 its advice is the same as I find in /usr/src/Makefile: # 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' # # See src/UPDATING `COMMON ITEMS' for more complete information. However in section 19.4.4 it says that mergemaster -p should be done earlier in the process; and section 19.4.10 doesn't suggest doing mergemaster -p there, which would be consistent with the initial advice. 19.4.4 describes the -p flag as "pre-buildworld". 'man mergemaster' says the same, and also says it "compares only files known to be essential to the success of {build|install}world". That implies it may need to be done before make buildworld, as well or instead of before make installworld. >How-To-Repeat: >Fix: Make it clear where mergemaster -p should be done in the entire process: is it ever required before buildworld, or only before installworld? >Release-Note: >Audit-Trail: >Unformatted: