Removing old files is not an optional step on updating and upgrading FreeBSD.

Reflect this by merging make delete-old section into the updating section.

This change rewords the section such that it fits in with the content around it,
and is the followup commit to r41772.

PR:		docs/162699
Approved by:	gjb (mentor)
This commit is contained in:
Chris Rees 2013-05-29 17:50:03 +00:00
parent 43b1e97a57
commit 50642ccc0a
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=41773

View file

@ -1874,12 +1874,31 @@ Fetching 133 new ports or files... done.</screen>
now that the new world is on disk.</para>
</listitem>
<listitem>
<para><command>make
<maketarget>delete-old</maketarget></command></para>
<para>This target deletes old (obsolete) files. This is important
because sometimes they cause problems if left on the disk, for
example the presence of the old <filename>utmp.h</filename>
causes problems in some ports when the new
<filename>utmpx.h</filename> is installed.</para>
</listitem>
<listitem>
<para>Reboot.</para>
<para>A full machine reboot is needed now to load the new
kernel and new world with new configuration files.</para>
</listitem>
<listitem>
<para><command>make <maketarget>delete-old-libs</maketarget></command></para>
<para>Remove any obsolete libraries to avoid conflicts with newer
ones. Make sure that all ports have been rebuilt
before old libraries are removed.</para>
</listitem>
</orderedlist>
<para>Upgrades from one release of the same &os; branch to a
@ -1935,7 +1954,9 @@ Fetching 133 new ports or files... done.</screen>
&prompt.root; <userinput>cd /usr/src</userinput>
&prompt.root; <userinput>make installworld</userinput>
&prompt.root; <userinput>mergemaster</userinput>
&prompt.root; <userinput>reboot</userinput></screen>
&prompt.root; <userinput>make delete-old</userinput>
&prompt.root; <userinput>reboot</userinput>
&prompt.root; <userinput>make delete-old-libs</userinput></screen>
<warning>
<title>Read Further Explanations</title>
@ -2640,11 +2661,10 @@ Script done, &hellip;</screen>
</author>
</authorgroup>
</sect2info>
<title>Deleting Obsolete Files, Directories and Libraries</title>
<title>Deleting Obsolete Files and Directories</title>
<indexterm>
<primary>Deleting obsolete files, directories and
libraries</primary>
<primary>Deleting obsolete files and directories</primary>
</indexterm>
<para>As a part of the &os; development lifecycle, files and their
@ -2663,15 +2683,14 @@ Script done, &hellip;</screen>
The following instructions should be used to remove obsolete
files during the system upgrade process.</para>
<para>Follow the steps outlined in <xref
linkend="canonical-build"/>. After the
<command>make <maketarget>installworld</maketarget></command>
<para>After the <command>make
<maketarget>installworld</maketarget></command>
and the subsequent <command>mergemaster</command> have finished
successfully, check for obsolete files and libraries as
follows:</para>
<screen>&prompt.root; <userinput>cd /usr/src</userinput>
&prompt.root; <userinput>make check-old</userinput></screen>
&prompt.root; <userinput>make check-old</userinput></screen>
<para>If any obsolete files are found, they can be deleted using
the following command:</para>
@ -2705,7 +2724,7 @@ Script done, &hellip;</screen>
<screen>&prompt.root; <userinput>shutdown -r now</userinput></screen>
</sect2>
<sect2>
<sect2 id="make-delete-old-libs">
<title>Deleting obsolete libraries</title>
<warning>
@ -2729,7 +2748,7 @@ Script done, &hellip;</screen>
causing messages like these:</para>
<screen>/usr/bin/ld: warning: libz.so.4, needed by /usr/local/lib/libtiff.so, may conflict with libz.so.5
/usr/bin/ld: warning: librpcsvc.so.4, needed by /usr/local/lib/libXext.so, may conflict with librpcsvc.so.5</screen>
/usr/bin/ld: warning: librpcsvc.so.4, needed by /usr/local/lib/libXext.so, may conflict with librpcsvc.so.5</screen>
<para>To solve these problems, determine which port installed the
library:</para>