State that 5-exp is now the default testbench, not 4-exp. State that the
docs tree is no longer required. While here, fix copyright and typos.
This commit is contained in:
parent
5eb7e020db
commit
cc122dc67e
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=26922
1 changed files with 20 additions and 21 deletions
|
@ -17,6 +17,7 @@
|
|||
<year>2003</year>
|
||||
<year>2004</year>
|
||||
<year>2005</year>
|
||||
<year>2006</year>
|
||||
<holder role="mailto:portmgr@FreeBSD.org">The &os; Ports
|
||||
Management Team</holder>
|
||||
</copyright>
|
||||
|
@ -63,7 +64,7 @@
|
|||
been added. A disconnected node is
|
||||
one that does not mount the cluster master via NFS. It could be
|
||||
a remote node, for example. The cluster master rsync's the
|
||||
interesting data (ports, src, and doc trees, bindist tarballs,
|
||||
interesting data (ports and src trees, bindist tarballs,
|
||||
scripts, etc.) to disconnected nodes during the node-setup
|
||||
phase. Then, the disconnected portbuild directory is
|
||||
nullfs-mounted for chroot builds.</para>
|
||||
|
@ -173,7 +174,7 @@
|
|||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>><command>dopackages.6</command> - Perform
|
||||
<para><command>dopackages.6</command> - Perform
|
||||
a 6.X build
|
||||
</para>
|
||||
</listitem>
|
||||
|
@ -298,7 +299,7 @@
|
|||
<listitem>
|
||||
<para><literal>-nodoccvs</literal> - Do not
|
||||
<command>cvs update</command> the
|
||||
<literal>doc</literal> tree during preprocessing.
|
||||
<literal>doc</literal> tree during preprocessing. (obsolete)
|
||||
</para>
|
||||
</listitem>
|
||||
|
||||
|
@ -376,12 +377,6 @@
|
|||
</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>A CVS checkout of the running branch's
|
||||
<literal>doc</literal> tree [*]
|
||||
</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>A CVS checkout of the running branch's
|
||||
<literal>src</literal> tree [*]
|
||||
|
@ -448,6 +443,10 @@
|
|||
and their error logs to
|
||||
<filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/errors</filename>.
|
||||
</para>
|
||||
|
||||
<para>Formerly the docs tree was also checked out, however, it has
|
||||
been found to be unneccessary.
|
||||
</para>
|
||||
</sect1>
|
||||
|
||||
<sect1 id="interrupting">
|
||||
|
@ -625,7 +624,7 @@
|
|||
new features or bugfixes to the ports infrastructure (i.e.
|
||||
<literal>bsd.port.mk</literal>), or to test large sweeping
|
||||
upgrades. The current experimental patches branch is
|
||||
<literal>4-exp</literal> on the &i386;
|
||||
<literal>5-exp</literal> on the &i386;
|
||||
architecture.</para>
|
||||
|
||||
<para>In general, an experimental patches build is run the same
|
||||
|
@ -639,7 +638,7 @@
|
|||
<para>In order to have a good control case with which to compare
|
||||
failures, you should first do a package build of the branch on
|
||||
which the experimental patches branch is based for the &i386;
|
||||
architecture (currently this is <literal>4</literal>). Then, when
|
||||
architecture (currently this is <literal>5</literal>). Then, when
|
||||
preparing for the experimental patches build, checkout a ports
|
||||
tree and a src tree with the same date as was used for the control
|
||||
build. This will ensure an apples-to-apples comparison
|
||||
|
@ -651,21 +650,21 @@
|
|||
|
||||
<para>Once the build finishes, compare the control build failures
|
||||
to those of the experimental patches build. Use the following
|
||||
commands to facilitate this (this assumes the <literal>4</literal>
|
||||
branch is the control branch, and the <literal>4-exp</literal>
|
||||
commands to facilitate this (this assumes the <literal>5</literal>
|
||||
branch is the control branch, and the <literal>5-exp</literal>
|
||||
branch is the experimental patches branch):</para>
|
||||
|
||||
<screen>&prompt.user; <userinput>cd /var/portbuild/i386/4-exp/errors</userinput>
|
||||
&prompt.user; <userinput>find . -name \*.log\* | sort > /tmp/4-exp-errs</userinput>
|
||||
&prompt.user; <userinput>cd /var/portbuild/i386/4/errors</userinput>
|
||||
&prompt.user; <userinput>find . -name \*.log\* | sort > /tmp/4-errs</userinput></screen>
|
||||
<screen>&prompt.user; <userinput>cd /var/portbuild/i386/5-exp/errors</userinput>
|
||||
&prompt.user; <userinput>find . -name \*.log\* | sort > /tmp/5-exp-errs</userinput>
|
||||
&prompt.user; <userinput>cd /var/portbuild/i386/5/errors</userinput>
|
||||
&prompt.user; <userinput>find . -name \*.log\* | sort > /tmp/5-errs</userinput></screen>
|
||||
|
||||
<note><para>If it has been a long time since one of the builds
|
||||
finished, the logs may have been automatically compressed with
|
||||
bzip2. In that case, you must use <literal>sort | sed
|
||||
's,\.bz2,,g'</literal> instead.</para></note>
|
||||
|
||||
<screen>&prompt.user; <userinput>comm -3 /tmp/4-errs /tmp/4-exp-errs | less</userinput></screen>
|
||||
<screen>&prompt.user; <userinput>comm -3 /tmp/5-errs /tmp/5-exp-errs | less</userinput></screen>
|
||||
|
||||
<para>This last command will produce a two-column report. The
|
||||
first column is ports that failed on the control build but not in
|
||||
|
@ -720,7 +719,7 @@
|
|||
To differentiate between [1] and [2] above, you can do a rebuild
|
||||
of the affected packages under the control branch:</para>
|
||||
|
||||
<screen>&prompt.user; <userinput>cd /var/portbuild/i386/4/ports</userinput></screen>
|
||||
<screen>&prompt.user; <userinput>cd /var/portbuild/i386/5/ports</userinput></screen>
|
||||
|
||||
<note><para>Be sure to cvs update this tree to the same date as
|
||||
the experimental patches tree.</para></note>
|
||||
|
@ -728,14 +727,14 @@
|
|||
<para>The following command will set up the control branch for
|
||||
the partial build:</para>
|
||||
|
||||
<screen>&prompt.user; <userinput>/var/portbuild/scripts/dopackages.4 -noportscvs -nobuild -nocvs -nofinish</userinput></screen>
|
||||
<screen>&prompt.user; <userinput>/var/portbuild/scripts/dopackages.5 -noportscvs -nobuild -nocvs -nofinish</userinput></screen>
|
||||
|
||||
<para>The builds must be performed from the
|
||||
<literal>packages/All</literal> directory. This directory should
|
||||
initially be empty except for the Makefile symlink. If this
|
||||
symlink does not exist, it must be created:</para>
|
||||
|
||||
<screen>&prompt.user; <userinput>cd /var/portbuild/i386/4/packages/All</userinput>
|
||||
<screen>&prompt.user; <userinput>cd /var/portbuild/i386/5/packages/All</userinput>
|
||||
&prompt.user; <userinput>ln -sf ../../Makefile .</userinput>
|
||||
&prompt.user; <userinput>make -k -j<#> <list of packages to build></userinput></screen>
|
||||
|
||||
|
|
Loading…
Reference in a new issue