|
Lines 561-567
Link Here
|
| 561 |
</indexterm> |
561 |
</indexterm> |
| 562 |
<para><application>CTM</application>, on the other hand, does not |
562 |
<para><application>CTM</application>, on the other hand, does not |
| 563 |
interactively compare the sources you have with those on the master |
563 |
interactively compare the sources you have with those on the master |
| 564 |
archive or otherwise pull them across.. Instead, a script which |
564 |
archive or otherwise pull them across. Instead, a script which |
| 565 |
identifies changes in files since its previous run is executed |
565 |
identifies changes in files since its previous run is executed |
| 566 |
several times a day on the master CTM machine, any detected changes |
566 |
several times a day on the master CTM machine, any detected changes |
| 567 |
being compressed, stamped with a sequence-number and encoded for |
567 |
being compressed, stamped with a sequence-number and encoded for |
|
Lines 699-706
Link Here
|
| 699 |
to exist. When performing an upgrade it is likely that these |
699 |
to exist. When performing an upgrade it is likely that these |
| 700 |
groups did not exist. This caused problems when upgrading.</para> |
700 |
groups did not exist. This caused problems when upgrading.</para> |
| 701 |
|
701 |
|
| 702 |
<para>The most recent example of this is when the <quote/ppp/ group |
702 |
<para>The most recent example of this is when the <groupname>ppp</groupname> group |
| 703 |
(later renamed <quote/network/) was added. Users had the |
703 |
(later renamed <groupname>network</groupname>) was added. Users had the |
| 704 |
installation process fail for them when parts of the |
704 |
installation process fail for them when parts of the |
| 705 |
<filename>ppp</filename> subsystem were installed using a |
705 |
<filename>ppp</filename> subsystem were installed using a |
| 706 |
non-existent (for them) group name.</para> |
706 |
non-existent (for them) group name.</para> |
|
Lines 930-936
Link Here
|
| 930 |
|
930 |
|
| 931 |
<screen>&prompt.root; <userinput>make buildworld</userinput></screen> |
931 |
<screen>&prompt.root; <userinput>make buildworld</userinput></screen> |
| 932 |
|
932 |
|
| 933 |
<para>It is now possible to specify a -j option to |
933 |
<para>It is now possible to specify a <option>-j</option> option to |
| 934 |
<command>make</command> which will cause it to spawn several |
934 |
<command>make</command> which will cause it to spawn several |
| 935 |
simultaneous processes. This is most useful on multi-CPU machines. |
935 |
simultaneous processes. This is most useful on multi-CPU machines. |
| 936 |
However, since much of the compiling process is IO bound rather |
936 |
However, since much of the compiling process is IO bound rather |
|
Lines 962-968
Link Here
|
| 962 |
</indexterm> |
962 |
</indexterm> |
| 963 |
|
963 |
|
| 964 |
<para>Many factors influence the build time, but currently a 500 MHz |
964 |
<para>Many factors influence the build time, but currently a 500 MHz |
| 965 |
Pentium 3 with 128 MB of RAM takes about 2 hours to build |
965 |
Pentium III with 128 MB of RAM takes about 2 hours to build |
| 966 |
the &os.stable; tree, with no tricks or shortcuts used during the |
966 |
the &os.stable; tree, with no tricks or shortcuts used during the |
| 967 |
process. A &os.current; tree will take somewhat longer.</para> |
967 |
process. A &os.current; tree will take somewhat longer.</para> |
| 968 |
</sect3> |
968 |
</sect3> |
|
Lines 1099-1105
Link Here
|
| 1099 |
merge the temporary file with the currently installed file, or view the |
1099 |
merge the temporary file with the currently installed file, or view the |
| 1100 |
&man.diff.1; results again.</para> |
1100 |
&man.diff.1; results again.</para> |
| 1101 |
|
1101 |
|
| 1102 |
<para>Choosing to delete the temporary will tell &man.mergemaster.8; that we |
1102 |
<para>Choosing to delete the temporary file will tell &man.mergemaster.8; that we |
| 1103 |
wish to keep our current file unchanged, and to delete the one that is |
1103 |
wish to keep our current file unchanged, and to delete the one that is |
| 1104 |
new. This option is not the most recommended one, unless you see no |
1104 |
new. This option is not the most recommended one, unless you see no |
| 1105 |
reason to change the current file. You can get help at any time by |
1105 |
reason to change the current file. You can get help at any time by |
|
Lines 1418-1424
Link Here
|
| 1418 |
|
1418 |
|
| 1419 |
<answer> |
1419 |
<answer> |
| 1420 |
<para>There is no easy answer to this one, as it depends on the |
1420 |
<para>There is no easy answer to this one, as it depends on the |
| 1421 |
nature of the change. For example, if you just ran CVSup, and |
1421 |
nature of the change. For example, if you just ran <application>CVSup</application>, and |
| 1422 |
it has shown the following files as being updated,</para> |
1422 |
it has shown the following files as being updated,</para> |
| 1423 |
|
1423 |
|
| 1424 |
<screen><filename>src/games/cribbage/instr.c</filename> |
1424 |
<screen><filename>src/games/cribbage/instr.c</filename> |
|
Lines 1500-1506
Link Here
|
| 1500 |
corners.</para> |
1500 |
corners.</para> |
| 1501 |
|
1501 |
|
| 1502 |
<para>If you want to live dangerously then make the world, passing |
1502 |
<para>If you want to live dangerously then make the world, passing |
| 1503 |
the <makevar>NOCLEAN</makevar> definition to make, like |
1503 |
the <makevar>NOCLEAN</makevar> definition to <command>make</command>, like |
| 1504 |
this:</para> |
1504 |
this:</para> |
| 1505 |
|
1505 |
|
| 1506 |
<screen>&prompt.root; <userinput>make -DNOCLEAN world</userinput></screen> |
1506 |
<screen>&prompt.root; <userinput>make -DNOCLEAN world</userinput></screen> |
|
Lines 1601-1611
Link Here
|
| 1601 |
|
1601 |
|
| 1602 |
<listitem> |
1602 |
<listitem> |
| 1603 |
<para>Also in <filename>/etc/make.conf</filename>, set |
1603 |
<para>Also in <filename>/etc/make.conf</filename>, set |
| 1604 |
<makevar>CFLAGS</makevar> to something like <quote>-O |
1604 |
<makevar>CFLAGS</makevar> to something like <option>-O |
| 1605 |
-pipe</quote>. The optimization <quote>-O2</quote> is much |
1605 |
-pipe</option>. The optimization <option>-O2</option> is much |
| 1606 |
slower, and the optimization difference between |
1606 |
slower, and the optimization difference between |
| 1607 |
<quote>-O</quote> and <quote>-O2</quote> is normally |
1607 |
<option>-O</option> and <option>-O2</option> is normally |
| 1608 |
negligible. <quote>-pipe</quote> lets the compiler use |
1608 |
negligible. <option>-pipe</option> lets the compiler use |
| 1609 |
pipes rather than temporary files for communication, which |
1609 |
pipes rather than temporary files for communication, which |
| 1610 |
saves disk access (at the expense of memory).</para> |
1610 |
saves disk access (at the expense of memory).</para> |
| 1611 |
</listitem> |
1611 |
</listitem> |