Date: Tue, 8 Jul 2003 10:55:42 -0400 (EDT) From: Matthew George <mdg@secureworks.net> To: freebsd-gnats-submit@FreeBSD.org Subject: misc/54220: [PATCH] /usr/src/Makefile has wrong instructions for upgrade process Message-ID: <20030708104307.I64707@localhost> Resent-Message-ID: <200307081500.h68F0Y09021228@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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: <organization of PR author (multiple lines)> >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: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030708104307.I64707>