From owner-freebsd-bugs@FreeBSD.ORG Tue Jul 8 08:00:36 2003 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E636D37B404 for ; Tue, 8 Jul 2003 08:00:35 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id A236343FBF for ; Tue, 8 Jul 2003 08:00:34 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h68F0YUp021229 for ; Tue, 8 Jul 2003 08:00:34 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h68F0Y09021228; Tue, 8 Jul 2003 08:00:34 -0700 (PDT) Resent-Date: Tue, 8 Jul 2003 08:00:34 -0700 (PDT) Resent-Message-Id: <200307081500.h68F0Y09021228@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Matthew George Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B058D37B401 for ; Tue, 8 Jul 2003 07:55:43 -0700 (PDT) Received: from mail.secureworks.net (mail.secureworks.net [209.101.212.155]) by mx1.FreeBSD.org (Postfix) with SMTP id EBDED43F93 for ; Tue, 8 Jul 2003 07:55:42 -0700 (PDT) (envelope-from mdg@secureworks.net) Received: (qmail 25438 invoked from network); 8 Jul 2003 14:52:55 -0000 Received: from unknown (HELO HOST-192-168-17-31.internal.secureworks.net) (209.101.212.253) by mail.secureworks.net with SMTP; 8 Jul 2003 14:52:55 -0000 Message-Id: <20030708104307.I64707@localhost> Date: Tue, 8 Jul 2003 10:55:42 -0400 (EDT) From: Matthew George To: freebsd-gnats-submit@FreeBSD.org Subject: misc/54220: [PATCH] /usr/src/Makefile has wrong instructions for upgrade process X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jul 2003 15:00:36 -0000 >Number: 54220 >Category: misc >Synopsis: [PATCH] /usr/src/Makefile has wrong instructions for upgrade process >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: doc-bug >Submitter-Id: current-users >Arrival-Date: Tue Jul 08 08:00:34 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Matthew George >Release: FreeBSD 5.1-RELEASE i386 >Organization: >Environment: System: FreeBSD mdg.secureworks.net 5.1-RELEASE FreeBSD 5.1-RELEASE #2: Tue Jun 10 11:13:46 EDT 2003 mdg@mdg.secureworks.net:/usr/src/sys/i386/compile/GENERIC i386 >Description: /usr/src/Makefile indicates that mergemaster -p should be run after everything has been built and the new kernel installed. This should actually be run prior to building anything. see mergemaster(8), freebsd-stable thread dated 7/7/2003 Re: FreeBSD 4.4-REL to FreeBSD 4.8-STABLE upgrade problem. >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/src/Makefile,v retrieving revision 1.284 diff -u -r1.284 Makefile --- Makefile 4 Jul 2003 17:35:26 -0000 1.284 +++ Makefile 8 Jul 2003 14:52:08 -0000 @@ -41,11 +41,11 @@ # 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' +# 2. `mergemaster -p' +# 3. `make buildworld' +# 4. `make buildkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). +# 5. `make installkernel KERNCONF=YOUR_KERNEL_HERE' (default is GENERIC). +# 6. `reboot' (in single user mode: boot -s from the loader prompt). # 7. `make installworld' # 8. `mergemaster' # 9. `reboot' -- Matthew George SecureWorks Technical Operations >Release-Note: >Audit-Trail: >Unformatted: