Note that 6-exp is added as the default "experimental" ports build
branch, replacing 5-exp. 4-exp has been deleted. While here, fix some other minor errors. More changes will be forthcoming in the next few days.
This commit is contained in:
Mark Linimon
parent
06fedbec29
commit
60e7530a13
Notes:
svn2git
2020-12-08 03:00:23 +00:00
svn path=/head/; revision=28124
1 changed files with 30 additions and 24 deletions
|
|
@ -47,7 +47,7 @@
|
|||
be used to specify one of the package architectures
|
||||
(&i386;, alpha, &sparc64;, ia64, and amd64), and
|
||||
<replaceable>${branch}</replaceable> will be used
|
||||
to specify the build branch (4, 4-exp, 5, 5-exp, 6, 7).
|
||||
to specify the build branch (4, 5, 5-exp, 6, 6-exp, 7).
|
||||
</para>
|
||||
</sect1>
|
||||
|
||||
|
|
@ -153,13 +153,6 @@
|
|||
</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para><command>dopackages.4-exp</command> - Perform
|
||||
a 4.X build with experimental patches
|
||||
(4-exp branch)
|
||||
</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para><command>dopackages.5</command> - Perform a
|
||||
5.X build
|
||||
|
|
@ -179,6 +172,13 @@
|
|||
</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para><command>dopackages.6-exp</command> - Perform
|
||||
a 6.X build with experimental patches
|
||||
(6-exp branch)
|
||||
</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para><command>dopackages.7</command> - Perform
|
||||
a 7.X build
|
||||
|
|
@ -193,7 +193,7 @@
|
|||
<command>dopackages.wrapper</command>. These scripts
|
||||
take a number of arguments. For example:</para>
|
||||
|
||||
<screen><command>dopackages.5 <replaceable>${arch}</replaceable> <literal>[-options]</literal></command></screen>
|
||||
<screen><command>dopackages.6 <replaceable>${arch}</replaceable> <literal>[-options]</literal></command></screen>
|
||||
|
||||
<para><literal>[-options]</literal> may be zero or more of the
|
||||
following:</para>
|
||||
|
|
@ -346,7 +346,7 @@
|
|||
|
||||
<para>Be careful that <filename>ports/Makefile</filename>
|
||||
does not specify any empty subdirectories. This is especially
|
||||
important if you are doing a 4-exp build. If the build
|
||||
important if you are doing an -exp build. If the build
|
||||
process encounters an empty subdirectory, both package build
|
||||
phases will stop short, and an error similar to the following
|
||||
will be written to
|
||||
|
|
@ -361,6 +361,12 @@
|
|||
by running the proper <command>dopackages</command> command
|
||||
with the <literal>-restart</literal> option.
|
||||
</para>
|
||||
|
||||
<note>
|
||||
<para>This problem also appears if you create a new category
|
||||
<filename>Makefile</filename> with no <makevar>SUBDIR</makevar>s
|
||||
in it. This is probably a bug.</para>
|
||||
</note>
|
||||
</sect1>
|
||||
|
||||
<sect1 id="anatomy">
|
||||
|
|
@ -372,13 +378,13 @@
|
|||
|
||||
<orderedlist>
|
||||
<listitem>
|
||||
<para>A CVS checkout of the current <literal>ports</literal>
|
||||
<para>A CVS update of the current <literal>ports</literal>
|
||||
tree [*]
|
||||
</para>
|
||||
</listitem>
|
||||
|
||||
<listitem>
|
||||
<para>A CVS checkout of the running branch's
|
||||
<para>A CVS update of the running branch's
|
||||
<literal>src</literal> tree [*]
|
||||
</para>
|
||||
</listitem>
|
||||
|
|
@ -624,7 +630,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>5-exp</literal> on the &i386;
|
||||
<literal>6-exp</literal> on the &i386;
|
||||
architecture.</para>
|
||||
|
||||
<para>In general, an experimental patches build is run the same
|
||||
|
|
@ -638,7 +644,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>5</literal>). Then, when
|
||||
architecture (currently this is <literal>6</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
|
||||
|
|
@ -650,21 +656,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>5</literal>
|
||||
branch is the control branch, and the <literal>5-exp</literal>
|
||||
commands to facilitate this (this assumes the <literal>6</literal>
|
||||
branch is the control branch, and the <literal>6-exp</literal>
|
||||
branch is the experimental patches branch):</para>
|
||||
|
||||
<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>
|
||||
<screen>&prompt.user; <userinput>cd /var/portbuild/i386/6-exp/errors</userinput>
|
||||
&prompt.user; <userinput>find . -name \*.log\* | sort > /tmp/6-exp-errs</userinput>
|
||||
&prompt.user; <userinput>cd /var/portbuild/i386/6/errors</userinput>
|
||||
&prompt.user; <userinput>find . -name \*.log\* | sort > /tmp/6-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/5-errs /tmp/5-exp-errs | less</userinput></screen>
|
||||
<screen>&prompt.user; <userinput>comm -3 /tmp/6-errs /tmp/6-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
|
||||
|
|
@ -719,7 +725,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/5/ports</userinput></screen>
|
||||
<screen>&prompt.user; <userinput>cd /var/portbuild/i386/6/ports</userinput></screen>
|
||||
|
||||
<note><para>Be sure to cvs update this tree to the same date as
|
||||
the experimental patches tree.</para></note>
|
||||
|
|
@ -727,14 +733,14 @@
|
|||
<para>The following command will set up the control branch for
|
||||
the partial build:</para>
|
||||
|
||||
<screen>&prompt.user; <userinput>/var/portbuild/scripts/dopackages.5 -noportscvs -nobuild -nocvs -nofinish</userinput></screen>
|
||||
<screen>&prompt.user; <userinput>/var/portbuild/scripts/dopackages.6 -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/5/packages/All</userinput>
|
||||
<screen>&prompt.user; <userinput>cd /var/portbuild/i386/6/packages/All</userinput>
|
||||
&prompt.user; <userinput>ln -sf ../../Makefile .</userinput>
|
||||
&prompt.user; <userinput>make -k -j<#> <list of packages to build></userinput></screen>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue