From owner-freebsd-doc@FreeBSD.ORG Thu Jul 22 08:23:05 2004 Return-Path: Delivered-To: freebsd-doc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C63A016A4CE for ; Thu, 22 Jul 2004 08:23:05 +0000 (GMT) Received: from eddie.nitro.dk (port324.ds1-khk.adsl.cybercity.dk [212.242.113.79]) by mx1.FreeBSD.org (Postfix) with ESMTP id 924B643D1F for ; Thu, 22 Jul 2004 08:23:03 +0000 (GMT) (envelope-from simon@eddie.nitro.dk) Received: by eddie.nitro.dk (Postfix, from userid 1000) id 77A9F11817; Thu, 22 Jul 2004 10:23:01 +0200 (CEST) Date: Thu, 22 Jul 2004 10:23:01 +0200 From: "Simon L. Nielsen" To: Ken Smith Message-ID: <20040722082300.GA39030@eddie.nitro.dk> References: <20040721165642.GA19955@electra.cse.Buffalo.EDU> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="SUOF0GtieIMvvwua" Content-Disposition: inline In-Reply-To: <20040721165642.GA19955@electra.cse.Buffalo.EDU> User-Agent: Mutt/1.5.6i cc: doc@freebsd.org Subject: Re: Handbook update for 'make world' X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jul 2004 08:23:05 -0000 --SUOF0GtieIMvvwua Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2004.07.21 12:56:42 -0400, Ken Smith wrote: >=20 > Thoughts? I *think* the flamewar over this change is finished but it mig= ht > be premature. But most of this probably should be done regardless IHMO. First, I think it's good to go over this, since the ambiguity of "make world" has been discussed before. > Most of this de-emphasises "make world" in favor of the broken-down > "make buildworld; make buildkernel; etc" procedure we've been recommending > for a while now. There is one significant-ish procedural change, I moved > the "mergemaster -p" step to be first because there are cases that the > "make buildworld" step now checks to see if users/groups exist before it > will even begin compiling stuff... Are you sure of that? I'm rather sure that you only need mergemaster -p before installworld, e.g. since you might be doing cross builds where you don't want to touch the host environment... UPDATING also has mergepaster -p before installworld, not before buildworld. > Index: chapter.sgml > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: /home/dcvs/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chap= ter.sgml,v > retrieving revision 1.203 > diff -u -r1.203 chapter.sgml > --- chapter.sgml 6 Jul 2004 15:09:54 -0000 1.203 > +++ chapter.sgml 21 Jul 2004 16:49:13 -0000 > @@ -61,7 +61,7 @@ > CTM. > > How to rebuild and reinstall the entire base > - system with make world. > + system with make buildworld (etc). I think it should be "make buildworld (etc).", since (etc) really isn't a command... The same appies to other entries in the patch. Perhaps it would be better just to write "rebuilding world" or something like that, where that can be used instead? > > =20 > > @@ -536,10 +536,10 @@ > > =20 > > - Using <command>make world</command> > + Using <command>make buildworld (etc)</command> > =20 > > - make world > + make buildworld (etc) > > Once you have synchronized your local source tree against a > particular version of &os; (&os.stable;, &os.current;, and so on) > @@ -556,7 +556,8 @@ > when you make mistakes, or when mistakes made by others in the > source tree render your system unbootable. > =20 > - Make sure you have taken a backup. And have a fixit floppy = to > + Make sure you have taken a backup. And have a fixit floppy = or > + bootable CD at > hand. You will probably never have to use it, but it is better to be > safe than sorry! > > @@ -593,7 +594,8 @@ > To update your system, you should use the following > procedure: > =20 > - &prompt.root; make buildworld > + &prompt.root; mergemaster -p > +&prompt.root; make buildworld > &prompt.root; make buildkernel > &prompt.root; make installkernel > &prompt.root; reboot > @@ -602,8 +604,7 @@ > boot -s from loader prompt for > example). Then run: > =20 > - &prompt.root; mergemaster -p > -&prompt.root; make installworld > + &prompt.root; make installworld > &prompt.root; mergemaster > &prompt.root; reboot > =20 > @@ -678,9 +679,11 @@ > /etc/group. > =20 > There have been occasions when the installation part of > - make world has expected certain usernames or grou= ps > + make installworld has expected certain usernames = or groups > to exist. When performing an upgrade it is likely that these > - users or groups did not exist. This caused problems when upgrading. > + users or groups did not exist. This caused problems when upgrading. > + In some cases make buildworld will check to see if > + these users or groups exist. > =20 > A recent example of this is when the > smmsp user was added. Users had the > @@ -785,7 +788,7 @@ > /usr/obj. The directories shadow those under > /usr/src. > =20 > - You can speed up the make world process, and > + You can speed up the make buildworld process,= and > possibly save yourself some dependency headaches by removing this > directory as well. > =20 > @@ -895,7 +898,10 @@ > &os.stable; midway between 2.2.2 and 2.2.5) the > world target has been split in > two: buildworld and > - installworld. > + installworld. Beginning with version ^ Should be double space. > + 5.3 of &os the world will be changed > + so it will not work at all by default because it is actually > + dangerous for most users. > =20 > As the names imply, buildworld > builds a complete new tree under /usr/obj, [...] > @@ -1740,7 +1746,7 @@ > build machine. It is going to be the > machine that the world and kernel are built on. Ideally, it > should be a fast machine that has sufficient spare CPU to > - run make world. You will also want to > + run make buildworld (etc). You will also want to How about using "make buildworld and make buildkernel" in this context - since that what matters for speeding up build. --=20 Simon L. Nielsen FreeBSD Documentation Team --SUOF0GtieIMvvwua Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (FreeBSD) iD8DBQFA/3lkh9pcDSc1mlERAsOxAJ4owmbVyaQ2QW6Jh0FTjjhfxmDAYwCeIQ9D Tn5yqswTY9PzRNpnYOaSdRA= =JNaO -----END PGP SIGNATURE----- --SUOF0GtieIMvvwua--