Date: Thu, 22 Jul 2004 10:23:01 +0200 From: "Simon L. Nielsen" <simon@FreeBSD.org> To: Ken Smith <kensmith@cse.Buffalo.EDU> Cc: doc@freebsd.org Subject: Re: Handbook update for 'make world' Message-ID: <20040722082300.GA39030@eddie.nitro.dk> In-Reply-To: <20040721165642.GA19955@electra.cse.Buffalo.EDU> References: <20040721165642.GA19955@electra.cse.Buffalo.EDU>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 @@
> <application>CTM</application>.</para>
> </listitem>
> <listitem><para>How to rebuild and reinstall the entire base
> - system with <command>make world</command>.</para>
> + system with <command>make buildworld (etc)</command>.</para>
I think it should be "<command>make buildworld</command> (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
<quote>world</quote>" or something like that, where that can be used
instead?
> </listitem>
> =20
> </itemizedlist>
> @@ -536,10 +536,10 @@
> </sect1>
> =20
> <sect1 id=3D"makeworld">
> - <title>Using <command>make world</command></title>
> + <title>Using <command>make buildworld (etc)</command></title>
> =20
> <indexterm>
> - <primary><command>make world</command></primary>
> + <primary><command>make buildworld (etc)</command></primary>
> </indexterm>
> <para>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.</para>
> =20
> - <para>Make sure you have taken a backup. And have a fixit floppy =
to
> + <para>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!</para>
> </warning>
> @@ -593,7 +594,8 @@
> <para>To update your system, you should use the following
> procedure:</para>
> =20
> - <screen>&prompt.root; <userinput>make buildworld</userinput>
> + <screen>&prompt.root; <userinput>mergemaster -p</userinput>
> +&prompt.root; <userinput>make buildworld</userinput>
> &prompt.root; <userinput>make buildkernel</userinput>
> &prompt.root; <userinput>make installkernel</userinput>
> &prompt.root; <userinput>reboot</userinput></screen>
> @@ -602,8 +604,7 @@
> <command>boot -s</command> from loader prompt for
> example). Then run:</para>
> =20
> - <screen>&prompt.root; <userinput>mergemaster -p</userinput>
> -&prompt.root; <userinput>make installworld</userinput>
> + <screen>&prompt.root; <userinput>make installworld</userinput>
> &prompt.root; <userinput>mergemaster</userinput>
> &prompt.root; <userinput>reboot</userinput></screen>
> =20
> @@ -678,9 +679,11 @@
> <filename>/etc/group</filename>.</para>
> =20
> <para>There have been occasions when the installation part of
> - <quote>make world</quote> has expected certain usernames or grou=
ps
> + <quote>make installworld</quote> 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.</pa=
ra>
> + users or groups did not exist. This caused problems when upgrading.
> + In some cases <quote>make buildworld</quote> will check to see if
> + these users or groups exist.</para>
> =20
> <para>A recent example of this is when the
> <username>smmsp</username> user was added. Users had the
> @@ -785,7 +788,7 @@
> <filename>/usr/obj</filename>. The directories shadow those under
> <filename>/usr/src</filename>.</para>
> =20
> - <para>You can speed up the <quote>make world</quote> process, and
> + <para>You can speed up the <quote>make buildworld</quote> process,=
and
> possibly save yourself some dependency headaches by removing this
> directory as well.</para>
> =20
> @@ -895,7 +898,10 @@
> &os.stable; midway between 2.2.2 and 2.2.5) the
> <maketarget>world</maketarget> target has been split in
> two: <maketarget>buildworld</maketarget> and
> - <maketarget>installworld</maketarget>.</para>
> + <maketarget>installworld</maketarget>. Beginning with version
^ Should be double space.
> + 5.3 of &os the <maketarget>world</maketarget> will be changed
> + so it will not work at all by default because it is actually
> + dangerous for most users.</para>
> =20
> <para>As the names imply, <maketarget>buildworld</maketarget>
> builds a complete new tree under <filename>/usr/obj</filename>,
[...]
> @@ -1740,7 +1746,7 @@
> <emphasis>build machine</emphasis>. 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 <command>make world</command>. You will also want to
> + run <command>make buildworld (etc)</command>. You will also want to
How about using "<command>make buildworld</command> and <command>make
buildkernel</command>" 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040722082300.GA39030>