From owner-freebsd-bugs@FreeBSD.ORG  Tue Jul  8 08:20:08 2003
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
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 9AB9F37B401
	for <freebsd-bugs@hub.freebsd.org>;
	Tue,  8 Jul 2003 08:20:08 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3BE7643FBD
	for <freebsd-bugs@hub.freebsd.org>;
	Tue,  8 Jul 2003 08:20:08 -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 h68FK8Up025598
	for <freebsd-bugs@freefall.freebsd.org>;
	Tue, 8 Jul 2003 08:20:08 -0700 (PDT)
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h68FK8KS025597;
	Tue, 8 Jul 2003 08:20:08 -0700 (PDT)
Date: Tue, 8 Jul 2003 08:20:08 -0700 (PDT)
Message-Id: <200307081520.h68FK8KS025597@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
From: Matthew George <mdg@secureworks.net>
Subject: Re: 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
Reply-To: Matthew George <mdg@secureworks.net>
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Jul 2003 15:20:08 -0000

The following reply was made to PR misc/54220; it has been noted by GNATS.

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