Date: Thu, 11 Jul 2002 19:52:09 +0200 From: Gerhard Sittig <Gerhard.Sittig@gmx.net> To: freebsd-stable@FreeBSD.ORG Subject: Re: 4.6-RELEASE -> 4.5-RELENG Message-ID: <20020711195209.S1494@shell.gsinet.sittig.org> In-Reply-To: <20020710221740.E97EB5D03@ptavv.es.net>; from oberman@es.net on Wed, Jul 10, 2002 at 03:17:40PM -0700 References: <20020710214051.Q1494@shell.gsinet.sittig.org> <20020710221740.E97EB5D03@ptavv.es.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Jul 10, 2002 at 15:17 -0700, Kevin Oberman wrote:
> > Date: Wed, 10 Jul 2002 21:40:51 +0200
> > From: Gerhard Sittig <Gerhard.Sittig@gmx.net>
> > Sender: owner-freebsd-stable@FreeBSD.ORG
> >
> > On Wed, Jul 10, 2002 at 10:56 -0700, Kevin Oberman wrote:
> > >
> > > [ ... upgrading from source ... ]
> > >
> > > While there are a few niggles, the proper sequence is:
> > > mergemaster -p (This is NEW!)
> >
> > Should this read "sh usr.sbin/mergemaster/mergemaster.sh -p" for
> > the case where your in $PATH mergemaster(8) is just old enough to
> > not know the -p switch or where it lacks needed preparation steps
> > for the buildworld run to come?
>
> Actually, I believe that it should. Thanks for pointing this out.
I just checked rev "$FreeBSD: src/UPDATING,v 1.73.2.72 2002/07/05
12:48:52 des Exp $" of the UPDATING file (i.e. the one in the
-STABLE tree). While the 20020415 and 20020404 entries talk
about "using the new version of mergemaster" and especially the
latter mentions the -p option, the "COMMON ITEMS" section only has
the (non special) mergemaster invocation after the installworld
run. How about the following addition? (I didn't think too long
about the 3.x -> 4.x cross update since I'm not too familiar with
it while I did a 4.0 -> 4.6 update just last week:)
Index: UPDATING
===================================================================
RCS file: /CVSREPO/FreeBSD/src/UPDATING,v
retrieving revision 1.73.2.72
diff -u -r1.73.2.72 UPDATING
--- UPDATING 2002/07/05 12:48:52 1.73.2.72
+++ UPDATING 2002/07/11 17:01:01
@@ -447,6 +447,7 @@
To update from 4.0-RELEASE or later to the most current
4.x-STABLE
----------
+ sh usr.sbin/mergemaster/mergemaster.sh -p [3]
make buildworld
make buildkernel KERNCONF=YOUR_KERNEL_HERE
make installkernel KERNCONF=YOUR_KERNEL_HERE
@@ -466,6 +467,12 @@
[2] If you do not run mergemaster, you will likely hit a
number of show stopper problems. The biggest one is that
your /etc/pam.conf won't let you log in using ssh.
+ [3] Sometimes building or installing the new source tree
+ has prerequisites an older system doesn't satisfy. This
+ is what the "pre buildworld mode" of mergemaster was
+ introduced for. Make sure to either install the new
+ version of mergemaster before buildworld or run mergemaster
+ from its source directory where the new version is available.
What follows are older entries for those people upgrading from earlier
versions of -stable/-current.
virtually yours 82D1 9B9C 01DC 4FB4 D7B4 61BE 3F49 4F77 72DE DA76
Gerhard Sittig true | mail -s "get gpg key" Gerhard.Sittig@gmx.net
--
If you don't understand or are scared by any of the above
ask your parents or an adult to help you.
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020711195209.S1494>