From mdg@secureworks.net  Tue Jul  8 07:55:43 2003
Return-Path: <mdg@secureworks.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B058D37B401
	for <freebsd-gnats-submit@freebsd.org>; 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 <freebsd-gnats-submit@freebsd.org>; 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 <mdg@secureworks.net>
To: freebsd-gnats-submit@freebsd.org
Subject: [PATCH] /usr/src/Makefile has wrong instructions for upgrade process

>Number:         54220
>Category:       kern
>Synopsis:       [PATCH] /usr/src/Makefile has wrong instructions for upgrade process
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    remko
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          doc-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jul 08 08:00:34 PDT 2003
>Closed-Date:    Thu Feb 21 14:13:28 UTC 2008
>Last-Modified:  Thu Feb 21 14:13:28 UTC 2008
>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:
	<code/input/activities to reproduce the problem (multiple lines)>
>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:

From: Matthew George <mdg@secureworks.net>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: misc/54220: [PATCH] /usr/src/Makefile has wrong instructions 
 for upgrade process
Date: Tue, 8 Jul 2003 11:14:50 -0400 (EDT)

 oops, here is the exact same patch without the line wrap ...
 
 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
 
Responsible-Changed-From-To: freebsd-bugs->remko 
Responsible-Changed-By: remko 
Responsible-Changed-When: Wed Feb 13 20:50:07 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=54220 
State-Changed-From-To: open->closed 
State-Changed-By: remko 
State-Changed-When: Thu Feb 21 14:13:27 UTC 2008 
State-Changed-Why:  
This had been corrected already a couple of revisions ago. The 
mergemaster -p step should be taken before installing world, because 
world depends on possible changes that mergemaster -p can fix. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=54220 
>Unformatted:
