misc/54220: [PATCH] /usr/src/Makefile has wrong instructions for upgrade process

[Matthew George]

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

From: Matthew George <mdg at secureworks.net>
To: FreeBSD-gnats-submit at 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