Date: Sat, 12 Jan 2013 19:14:05 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org Subject: svn commit: r40579 - in projects/pkgng/en_US.ISO8859-1: articles/contributors articles/geom-class articles/portbuild articles/solid-state books/arch-handbook/driverbasics books/faq books/fdp-primer... Message-ID: <201301121914.r0CJE5N0037672@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Sat Jan 12 19:14:05 2013 New Revision: 40579 URL: http://svnweb.freebsd.org/changeset/doc/40579 Log: Merged /head/en_US.ISO8859-1:r40366-40577 Added: projects/pkgng/en_US.ISO8859-1/htdocs/4xx.xml - copied unchanged from r40577, head/en_US.ISO8859-1/htdocs/4xx.xml projects/pkgng/en_US.ISO8859-1/htdocs/releases/9.1R/announce.xml - copied unchanged from r40577, head/en_US.ISO8859-1/htdocs/releases/9.1R/announce.xml projects/pkgng/en_US.ISO8859-1/htdocs/releases/9.1R/errata.html - copied unchanged from r40577, head/en_US.ISO8859-1/htdocs/releases/9.1R/errata.html projects/pkgng/en_US.ISO8859-1/htdocs/releases/9.1R/hardware.html - copied unchanged from r40577, head/en_US.ISO8859-1/htdocs/releases/9.1R/hardware.html projects/pkgng/en_US.ISO8859-1/htdocs/releases/9.1R/installation.html - copied unchanged from r40577, head/en_US.ISO8859-1/htdocs/releases/9.1R/installation.html projects/pkgng/en_US.ISO8859-1/htdocs/releases/9.1R/readme.html - copied unchanged from r40577, head/en_US.ISO8859-1/htdocs/releases/9.1R/readme.html projects/pkgng/en_US.ISO8859-1/htdocs/releases/9.1R/relnotes-detailed.html - copied unchanged from r40577, head/en_US.ISO8859-1/htdocs/releases/9.1R/relnotes-detailed.html projects/pkgng/en_US.ISO8859-1/htdocs/releases/9.1R/relnotes.xml - copied unchanged from r40577, head/en_US.ISO8859-1/htdocs/releases/9.1R/relnotes.xml Deleted: projects/pkgng/en_US.ISO8859-1/htdocs/layout/images/front_get_back.png projects/pkgng/en_US.ISO8859-1/htdocs/layout/images/front_get_bl.png projects/pkgng/en_US.ISO8859-1/htdocs/layout/images/front_get_br.png projects/pkgng/en_US.ISO8859-1/htdocs/layout/images/front_get_tl.png projects/pkgng/en_US.ISO8859-1/htdocs/layout/images/front_get_tr.png projects/pkgng/en_US.ISO8859-1/htdocs/layout/images/front_new_back.png projects/pkgng/en_US.ISO8859-1/htdocs/layout/images/front_new_bl.png projects/pkgng/en_US.ISO8859-1/htdocs/layout/images/front_new_br.png projects/pkgng/en_US.ISO8859-1/htdocs/layout/images/front_new_tl.png projects/pkgng/en_US.ISO8859-1/htdocs/layout/images/front_new_tr.png Modified: projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.additional.xml projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.committers.xml projects/pkgng/en_US.ISO8859-1/articles/geom-class/article.xml projects/pkgng/en_US.ISO8859-1/articles/portbuild/article.xml projects/pkgng/en_US.ISO8859-1/articles/solid-state/article.xml projects/pkgng/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml projects/pkgng/en_US.ISO8859-1/books/faq/book.xml projects/pkgng/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.xml projects/pkgng/en_US.ISO8859-1/books/handbook/book.xml projects/pkgng/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml projects/pkgng/en_US.ISO8859-1/books/handbook/desktop/chapter.xml projects/pkgng/en_US.ISO8859-1/books/handbook/eresources/chapter.xml projects/pkgng/en_US.ISO8859-1/books/handbook/firewalls/chapter.xml projects/pkgng/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml projects/pkgng/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml projects/pkgng/en_US.ISO8859-1/books/handbook/ports/chapter.xml projects/pkgng/en_US.ISO8859-1/books/handbook/x11/chapter.xml projects/pkgng/en_US.ISO8859-1/books/porters-handbook/book.xml projects/pkgng/en_US.ISO8859-1/htdocs/Makefile projects/pkgng/en_US.ISO8859-1/htdocs/applications.xml projects/pkgng/en_US.ISO8859-1/htdocs/cgi/cgi-style.pl projects/pkgng/en_US.ISO8859-1/htdocs/cgi/man.cgi projects/pkgng/en_US.ISO8859-1/htdocs/community.xsl projects/pkgng/en_US.ISO8859-1/htdocs/copyright/Makefile projects/pkgng/en_US.ISO8859-1/htdocs/copyright/copyright.xml projects/pkgng/en_US.ISO8859-1/htdocs/copyright/freebsd-doc-license.xml projects/pkgng/en_US.ISO8859-1/htdocs/copyright/freebsd-license.xml projects/pkgng/en_US.ISO8859-1/htdocs/events/Makefile projects/pkgng/en_US.ISO8859-1/htdocs/index.xsl projects/pkgng/en_US.ISO8859-1/htdocs/layout/css/fixed.css projects/pkgng/en_US.ISO8859-1/htdocs/layout/css/layout.css projects/pkgng/en_US.ISO8859-1/htdocs/layout/images/Makefile projects/pkgng/en_US.ISO8859-1/htdocs/news/2012-compromise.xml projects/pkgng/en_US.ISO8859-1/htdocs/releases/9.1R/Makefile projects/pkgng/en_US.ISO8859-1/htdocs/releases/9.1R/schedule.xml projects/pkgng/en_US.ISO8859-1/htdocs/releases/index.xml projects/pkgng/en_US.ISO8859-1/htdocs/releng/index.xml projects/pkgng/en_US.ISO8859-1/htdocs/search/index-site.xsl projects/pkgng/en_US.ISO8859-1/htdocs/security/security.xml projects/pkgng/en_US.ISO8859-1/htdocs/snapshots/index.xml projects/pkgng/en_US.ISO8859-1/htdocs/where.xml projects/pkgng/en_US.ISO8859-1/share/xml/mailing-lists.ent Directory Properties: projects/pkgng/en_US.ISO8859-1/ (props changed) Modified: projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.additional.xml ============================================================================== --- projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Sat Jan 12 19:13:38 2013 (r40578) +++ projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Sat Jan 12 19:14:05 2013 (r40579) @@ -2419,18 +2419,23 @@ </listitem> <listitem> + <para>David Vachulka + <email>arch_dvx@users.sourceforge.net</email></para> + </listitem> + <listitem> + <para>David Wolfskill <email>david@catwhisker.org</email></para> </listitem> <listitem> - <para>Dax Labrador - <email>semprix@bsdmail.org</email></para> + <para>David Yeske + <email>dyeske@yahoo.com</email></para> </listitem> <listitem> - <para>David Yeske - <email>dyeske@yahoo.com</email></para> + <para>Dax Labrador + <email>semprix@bsdmail.org</email></para> </listitem> <listitem> @@ -3096,6 +3101,11 @@ </listitem> <listitem> + <para>Fabian M. Borschel + <email>fmb@onibox.net</email></para> + </listitem> + + <listitem> <para>Fabien Devaux <email>fab@gcu.info</email></para> </listitem> @@ -10533,6 +10543,11 @@ </listitem> <listitem> + <para>Victor Popov + <email>v.a.popov@gmail.com</email></para> + </listitem> + + <listitem> <para>Victor Semionov <email>semionov@mail.bg</email></para> </listitem> Modified: projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.committers.xml ============================================================================== --- projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Sat Jan 12 19:13:38 2013 (r40578) +++ projects/pkgng/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Sat Jan 12 19:14:05 2013 (r40579) @@ -624,6 +624,10 @@ </listitem> <listitem> + <para>&a.markj;</para> + </listitem> + + <listitem> <para>&a.tj;</para> </listitem> Modified: projects/pkgng/en_US.ISO8859-1/articles/geom-class/article.xml ============================================================================== --- projects/pkgng/en_US.ISO8859-1/articles/geom-class/article.xml Sat Jan 12 19:13:38 2013 (r40578) +++ projects/pkgng/en_US.ISO8859-1/articles/geom-class/article.xml Sat Jan 12 19:14:05 2013 (r40579) @@ -92,7 +92,7 @@ <listitem><para>The &man.style.9; man page — for documentation on the coding-style conventions which must be followed for any code - which is to be committed to the FreeBSD CVS tree.</para></listitem> + which is to be committed to the FreeBSD Subversion tree.</para></listitem> </itemizedlist> Modified: projects/pkgng/en_US.ISO8859-1/articles/portbuild/article.xml ============================================================================== --- projects/pkgng/en_US.ISO8859-1/articles/portbuild/article.xml Sat Jan 12 19:13:38 2013 (r40578) +++ projects/pkgng/en_US.ISO8859-1/articles/portbuild/article.xml Sat Jan 12 19:14:05 2013 (r40579) @@ -24,6 +24,7 @@ <year>2010</year> <year>2011</year> <year>2012</year> + <year>2013</year> <holder role="mailto:portmgr@FreeBSD.org">The &os; Ports Management Team</holder> </copyright> @@ -50,61 +51,64 @@ <ulink url="http://pointyhat.FreeBSD.org"></ulink>.</para>; <para>This article documents the internal workings of the - cluster.</para> + cluster.</para> <note> <para>Many of the details in this article will be of interest only to - those on the <ulink url="&url.base/portmgr">Ports Management</ulink> - team.</para> + those on the <ulink url="&url.base;/portmgr/">Ports Management</ulink> + team.</para> </note> <sect2 id="codebase"> <title>The codebase</title> - <para>Most of the package building magic occurs under the - <filename>/var/portbuild</filename> directory. Unless - otherwise specified, all paths will be relative to - this location. <replaceable>${arch}</replaceable> will - be used to specify one of the package architectures - (e.g., amd64, arm, &i386;, ia64, powerpc, &sparc64;), and - <replaceable>${branch}</replaceable> will be used - to specify the build branch (e.g., 7, 7-exp, 8, 8-exp, 9, 9-exp, 10, 10-exp). - The set of branches that <username>portmgr</username> currently - supports is the same as those that the &os; - <ulink url="http://www.freebsd.org/security/index.html#supported-branches">security team</ulink> - supports. - </para> - - <note> - <para>Packages are no longer built for branches 4, 5, or 6, nor - for the alpha architecture.</para> - </note> - - <para>The scripts that control all of this live in - <filename class="directory">/var/portbuild/scripts/</filename>. - These are the checked-out copies from the Subversion repository at - <ulink url="http://svnweb.freebsd.org/base/projects/portbuild/scripts/">; - <filename class="directory">base/projects/portbuild/scripts/</filename> - </ulink>.</para> - - <para>Typically, incremental builds are done that use previous - packages as dependencies; this takes less time, and puts less - load on the mirrors. Full builds are usually only done:</para> + <para>Most of the package building magic occurs under the + <filename>/var/portbuild</filename> directory. Unless + otherwise specified, all paths will be relative to + this location. <replaceable>${arch}</replaceable> will + be used to specify one of the package architectures + (e.g., amd64, arm, &i386;, ia64, powerpc, &sparc64;), and + <replaceable>${branch}</replaceable> will be used + to specify the build branch (e.g., 7, 7-exp, 8, 8-exp, 9, 9-exp, 10, 10-exp). + The set of branches that <username>portmgr</username> currently + supports is the same as those that the &os; + <ulink url="http://www.freebsd.org/security/index.html#supported-branches">security team</ulink> + supports. + </para> - <itemizedlist> - <listitem><para>right after release time, for the - <literal>-STABLE</literal> branches</para></listitem> + <note> + <para>Packages are no longer built for branches 4, 5, or 6, nor + for the alpha architecture.</para> + </note> - <listitem><para>periodically to test changes to - <literal>-CURRENT</literal> - </para></listitem> + <para>The scripts that control all of this live in + <filename role="directory">/var/portbuild/scripts/</filename>. + These are the checked-out copies from the Subversion repository at + <ulink url="http://svnweb.freebsd.org/base/projects/portbuild/scripts/">; + <filename role="directory">base/projects/portbuild/scripts/</filename> + </ulink>.</para> + + <para>Typically, incremental builds are done that use previous + packages as dependencies; this takes less time, and puts less + load on the mirrors. Full builds are usually only done:</para> - <listitem><para>for experimental (<literal>"exp-"</literal>) builds</para></listitem> + <itemizedlist> + <listitem> + <para>right after release time, for the + <literal>-STABLE</literal> branches</para> + </listitem> - </itemizedlist> + <listitem> + <para>periodically to test changes to + <literal>-CURRENT</literal></para> + </listitem> - <para>Packages from experimental builds are not uploaded.</para> + <listitem> + <para>for experimental (<literal>"exp-"</literal>) builds</para> + </listitem> + </itemizedlist> + <para>Packages from experimental builds are not uploaded.</para> </sect2> <sect2 id="codebase-notes"> @@ -116,38 +120,44 @@ for other hosts to be head nodes. Among the changes were:</para> <itemizedlist> - <listitem><para>removal of the hard-coding of the string - <literal>pointyhat</literal></para></listitem> + <listitem> + <para>removal of the hard-coding of the string + <literal>pointyhat</literal></para> + </listitem> - <listitem><para>factoring out all configuration constants (which - were previously scattered throughout the code) into configuration - files (see <link linkend="new-head-node">below</link>) - </para></listitem> - - <listitem><para>appending the hostname to the directories - specified by <literal>buildid</literal> (this will allow - directories to be unambigious when copied between machines.) - </para></listitem> + <listitem> + <para>factoring out all configuration constants (which + were previously scattered throughout the code) into configuration + files (see <link linkend="new-head-node">below</link>)</para> + </listitem> - <listitem><para>making the scripts more robust in terms of setting - up directories and symlinks</para></listitem> + <listitem> + <para>appending the hostname to the directories + specified by <literal>buildid</literal> (this will allow + directories to be unambigious when copied between machines.)</para> + </listitem> - <listitem><para>where necessary, changing certain script invocations - to make all the above easier</para></listitem> + <listitem> + <para>making the scripts more robust in terms of setting + up directories and symlinks</para> + </listitem> + <listitem> + <para>where necessary, changing certain script invocations + to make all the above easier</para> + </listitem> </itemizedlist> <para>This document was originally written before these changes were made. Where things such as script invocations have changed, - they are denoted as <literal>new codebase:</literal> as opposed + they were denoted as <literal>new codebase:</literal> as opposed to <literal>old codebase:</literal>.</para> <note> <para>Up until November 2012, <hostid>pointyhat</hostid> had still been running the old codebase. That installation has now been permanently offlined. Therefore, all the instructions having - to do with the old codebase are <emphasis>obsolete</emphasis>, - and will be removed in the near future.</para> + to do with the old codebase have been removed.</para> </note> <note> @@ -221,24 +231,16 @@ <para>The <filename>bindist.tar</filename> file is extracted onto each client at client boot time, and at the start of each pass of the <command>dopackages</command> - script. - </para> - - <sect2> - <title>New Codebase</title> + script.</para> - <para>For both commands above, if - <replaceable>${buildid}</replaceable> is - <literal>latest</literal>, it may be omitted. - </para> - </sect2> + <para>For both commands above, if + <replaceable>${buildid}</replaceable> is + <literal>latest</literal>, it may be omitted.</para> </sect1> <sect1 id="customizing"> <title>Customizing Your Build</title> - <para>(The following only applies to the new codebase.)</para> - <para>You can customize your build by providing local versions of <filename>make.conf</filename> and/or <filename>src.conf</filename>, @@ -291,8 +293,7 @@ <para>(For this case, the contents are also identical for both server and client.)</para> - <programlisting> -.if !defined(CC) || ${CC} == "cc" + <programlisting>.if !defined(CC) || ${CC} == "cc" CC=clang .endif .if !defined(CXX) || ${CXX} == "c++" @@ -303,8 +304,7 @@ CPP=clang-cpp .endif # Do not die on warnings NO_WERROR= -WERROR= -</programlisting> +WERROR=</programlisting> </example> <example> @@ -348,365 +348,260 @@ PKG_BIN=/usr/local/sbin/pkg</programlist <sect2 id="build-dopackages"> <title><command>dopackages</command> scripts</title> - <para>The <filename>scripts/dopackages</filename> scripts - are used to perform the builds.</para> - - <sect3> - <title>Old codebase</title> - <para>For the old codebase: the - most useful are:</para> - - <itemizedlist> - <listitem> - <para><command>dopackages.7</command> - Perform - a 7.X build - </para> - </listitem> - - <listitem> - <para><command>dopackages.7-exp</command> - Perform - a 7.X build with experimental patches - (7-exp branch) - </para> - </listitem> - - <listitem> - <para><command>dopackages.8</command> - Perform - a 8.X build - </para> - </listitem> - - <listitem> - <para><command>dopackages.8-exp</command> - Perform - a 8.X build with experimental patches - (8-exp branch) - </para> - </listitem> - - <listitem> - <para><command>dopackages.9</command> - Perform - a 9.X build - </para> - </listitem> - - <listitem> - <para><command>dopackages.9-exp</command> - Perform - a 9.X build with experimental patches - (9-exp branch) - </para> - </listitem> - - <listitem> - <para><command>dopackages.10</command> - Perform - a 10.X build - </para> - </listitem> - - <listitem> - <para><command>dopackages.10-exp</command> - Perform - a 10.X build with experimental patches - (10-exp branch) - </para> - </listitem> - </itemizedlist> - - <para>These are wrappers around <command>dopackages</command>, - and are all symlinked to <command>dopackages.wrapper</command>. - New branch wrapper scripts can be created by symlinking - <command>dopackages.${branch}</command> to - <command>dopackages.wrapper</command>. These scripts - take a number of arguments. For example:</para> - - <screen><command>dopackages.7 <replaceable>${arch}</replaceable> <replaceable>${buildid}</replaceable> <literal>[-options]</literal></command></screen> - - </sect3> - - <sect3> - <title>New codebase</title> - <para>The symlinks go away, and you just use - <command>dopackages.wrapper</command> directly. For example:</para> + <para>The <filename>scripts/dopackages.wrapper</filename> script + is used to perform the builds.</para> - <screen>&prompt.root; <userinput>dopackages.wrapper <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable> <literal>[-options]</literal></userinput></screen> + <screen>&prompt.root; <userinput>dopackages.wrapper <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable> <option>[-options]</option></userinput></screen> - </sect3> - - <sect3> - <title>Either codebase</title> - - <para>Most often, you will be using <literal>latest</literal> for - the value of <replaceable>buildid</replaceable>.</para> - - <para><literal>[-options]</literal> may be zero or more of the - following:</para> - - <itemizedlist> - <listitem> - <para><literal>-keep</literal> - Do not delete this build in the - future, when it would be normally deleted as part of the - <literal>latest</literal> - <literal>previous</literal> cycle. - Do not forget to clean it up manually when you no longer need it. - </para> - </listitem> + <para>Most often, you will be using <literal>latest</literal> for + the value of <replaceable>buildid</replaceable>.</para> - <listitem> - <para><literal>-nofinish</literal> - Do not perform - post-processing once the build is complete. Useful - if you expect that the build will need to be restarted - once it finishes. If you use this option, do not forget to cleanup - the clients when you do not need the build any more. - </para> - </listitem> + <para><literal>[-options]</literal> may be zero or more of the + following:</para> - <listitem> - <para><literal>-finish</literal> - Perform - post-processing only. - </para> - </listitem> + <itemizedlist> + <listitem> + <para><option>-keep</option> - Do not delete this build in the + future, when it would be normally deleted as part of the + <literal>latest</literal> - <literal>previous</literal> cycle. + Do not forget to clean it up manually when you no longer need it.</para> + </listitem> - <listitem> - <para><literal>-nocleanup</literal> - By default, when the - <literal>-finish</literal> stage of the build is complete, the build - data will be deleted from the clients. This option will prevent - that.</para> - </listitem> + <listitem> + <para><option>-nofinish</option> - Do not perform + post-processing once the build is complete. Useful + if you expect that the build will need to be restarted + once it finishes. If you use this option, do not forget to cleanup + the clients when you do not need the build any more.</para> + </listitem> - <listitem> - <para><literal>-restart</literal> - Restart an interrupted - (or non-<literal>finish</literal>ed) build from the - beginning. Ports that failed on the previous build will - be rebuilt. - </para> - </listitem> + <listitem> + <para><option>-finish</option> - Perform + post-processing only.</para> + </listitem> - <listitem> - <para><literal>-continue</literal> - Restart an interrupted - (or non-<literal>finish</literal>ed) build. Will not - rebuild ports that failed on the previous build. - </para> - </listitem> + <listitem> + <para><option>-nocleanup</option> - By default, when the + <option>-finish</option> stage of the build is complete, the build + data will be deleted from the clients. This option will prevent + that.</para> + </listitem> - <listitem> - <para><literal>-incremental</literal> - Compare the - interesting fields of the new - <literal>INDEX</literal> with the previous one, - remove packages and log files for the old ports that - have changed, and rebuild the rest. This - cuts down on build times substantially since - unchanged ports do not get rebuilt every time. - </para> - </listitem> + <listitem> + <para><option>-restart</option> - Restart an interrupted + (or non-<literal>finish</literal>ed) build from the + beginning. Ports that failed on the previous build will + be rebuilt.</para> + </listitem> - <listitem> - <para><literal>-cdrom</literal> - This package build is - intended to end up on a CD-ROM, so - <literal>NO_CDROM</literal> packages and distfiles - should be deleted in post-processing. - </para> - </listitem> + <listitem> + <para><option>-continue</option> - Restart an interrupted + (or non-<literal>finish</literal>ed) build. Will not + rebuild ports that failed on the previous build.</para> + </listitem> - <listitem> - <para><literal>-nobuild</literal> - Perform all - the preprocessing steps, but do not actually do - the package build. - </para> - </listitem> + <listitem> + <para><option>-incremental</option> - Compare the + interesting fields of the new + <filename>INDEX</filename> with the previous one, + remove packages and log files for the old ports that + have changed, and rebuild the rest. This + cuts down on build times substantially since + unchanged ports do not get rebuilt every time.</para> + </listitem> - <listitem> - <para><literal>-noindex</literal> - Do not rebuild - <filename>INDEX</filename> during preprocessing. - </para> - </listitem> + <listitem> + <para><option>-cdrom</option> - This package build is + intended to end up on a CD-ROM, so + <makevar>NO_CDROM</makevar> packages and distfiles + should be deleted in post-processing.</para> + </listitem> - <listitem> - <para><literal>-noduds</literal> - Do not rebuild the - <filename>duds</filename> file (ports that are never - built, e.g., those marked <literal>IGNORE</literal>, - <literal>NO_PACKAGE</literal>, etc.) during - preprocessing. - </para> - </listitem> + <listitem> + <para><option>-nobuild</option> - Perform all + the preprocessing steps, but do not actually do + the package build.</para> + </listitem> - <listitem> - <para><literal>-nochecksubdirs</literal> - Do not check the - <makevar>SUBDIRS</makevar> for ports that are not connected - to the build. (New codebase only). - </para> - </listitem> + <listitem> + <para><option>-noindex</option> - Do not rebuild + <filename>INDEX</filename> during preprocessing.</para> + </listitem> - <listitem> - <para><literal>-trybroken</literal> - Try to build - <literal>BROKEN</literal> ports (off by default - because the amd64/&i386; clusters are fast enough now - that when doing incremental builds, more time - was spent rebuilding things that were going to - fail anyway. Conversely, the other clusters - are slow enough that it would be a waste of time - to try and build <literal>BROKEN</literal> ports). - </para> - <note> - <para>With <literal>-trybroken</literal>, you probably - also want to use <literal>-fetch-original</literal> - (and, on the new codebase, - <literal>-unlimited-errors</literal>).</para> - </note> - </listitem> + <listitem> + <para><option>-noduds</option> - Do not rebuild the + <filename>duds</filename> file (ports that are never + built, e.g., those marked <literal>IGNORE</literal>, + <makevar>NO_PACKAGE</makevar>, etc.) during + preprocessing.</para> + </listitem> - <listitem> - <para><literal>-nosrc</literal> - Do not update the - <literal>src</literal> tree from the ZFS snapshot, keep the tree from - previous build instead. - </para> - </listitem> + <listitem> + <para><option>-nochecksubdirs</option> - Do not check the + <makevar>SUBDIRS</makevar> for ports that are not connected + to the build.</para> + </listitem> - <listitem> - <para><literal>-srcvcs</literal> - Do not update the - <literal>src</literal> tree from the ZFS snapshot, update it with - a fresh checkout instead. - </para> - </listitem> + <listitem> + <para><option>-trybroken</option> - Try to build + <makevar>BROKEN</makevar> ports (off by default + because the amd64/&i386; clusters are fast enough now + that when doing incremental builds, more time + was spent rebuilding things that were going to + fail anyway. Conversely, the other clusters + are slow enough that it would be a waste of time + to try and build <makevar>BROKEN</makevar> ports).</para> - <listitem> - <para><literal>-noports</literal> - Do not update the - <literal>ports</literal> tree from the ZFS snapshot, keep the tree from - previous build instead. - </para> - </listitem> + <note> + <para>With <option>-trybroken</option>, you probably + also want to use <option>-fetch-original</option> + and + <option>-unlimited-errors</option>.</para> + </note> + </listitem> - <listitem> - <para><literal>-portsvcs</literal> - Do not update the - <literal>ports</literal> tree from the ZFS snapshot, update it with - a fresh checkout instead. - </para> - </listitem> + <listitem> + <para><option>-nosrc</option> - Do not update the + <filename>src</filename> tree from the ZFS snapshot, keep the tree from + previous build instead.</para> + </listitem> - <listitem> - <para><literal>-norestr</literal> - Do not attempt to build - <literal>RESTRICTED</literal> ports. - </para> - </listitem> + <listitem> + <para><option>-srcvcs</option> - Do not update the + <filename>src</filename> tree from the ZFS snapshot, update it with + a fresh checkout instead.</para> + </listitem> - <listitem> - <para><literal>-noplistcheck</literal> - Do not make it fatal for - ports to leave behind files after deinstallation. - </para> - </listitem> + <listitem> + <para><option>-noports</option> - Do not update the + <filename>ports</filename> tree from the ZFS snapshot, keep the tree from + previous build instead.</para> + </listitem> - <listitem> - <para><literal>-nodistfiles</literal> - Do not collect distfiles - that pass <command>make checksum</command> for later - uploading to <hostid>ftp-master</hostid>. - </para> - </listitem> + <listitem> + <para><option>-portsvcs</option> - Do not update the + <filename>ports</filename> tree from the ZFS snapshot, update it with + a fresh checkout instead.</para> + </listitem> - <listitem> - <para><literal>-fetch-original</literal> - Fetch the - distfile from the original <literal>MASTER_SITES</literal> - rather than any cache such as on <hostid>ftp-master</hostid>. - </para> - </listitem> + <listitem> + <para><option>-norestr</option> - Do not attempt to build + <makevar>RESTRICTED</makevar> ports.</para> + </listitem> - <listitem> - <para><literal>-unlimited-errors</literal> (new codebase - only) - defeat the "qmanager threshhold" check for runaway - builds. You want this primarily when doing a - <literal>-restart</literal> of a build that you expect to mostly - fail, or perhaps a <literal>-trybroken</literal> run. By default, - the threshhold check is done.</para> - </listitem> - </itemizedlist> + <listitem> + <para><option>-noplistcheck</option> - Do not make it fatal for + ports to leave behind files after deinstallation.</para> + </listitem> - <para>Unless you specify <literal>-restart</literal>, - <literal>-continue</literal>, or <literal>-finish</literal>, - the symlinks for the existing builds will be rotated. i.e, - the existing symlink for <filename>previous</filename> will - be deleted; the most recent build will have its symlink changed - to <filename>previous/</filename>; and a new build will be - created and symlinked into <filename>latest/</filename>. - </para> + <listitem> + <para><option>-nodistfiles</option> - Do not collect distfiles + that pass <command>make checksum</command> for later + uploading to <hostid>ftp-master</hostid>.</para> + </listitem> - <para>If the last build finished cleanly you do not need to delete - anything. If it was interrupted, or you selected - <literal>-nocleanup</literal>, you need to clean up clients by running - </para> + <listitem> + <para><option>-fetch-original</option> - Fetch the + distfile from the original <makevar>MASTER_SITES</makevar> + rather than any cache such as on <hostid>ftp-master</hostid>.</para> + </listitem> - <para>&prompt.user; <userinput>build cleanup <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable> -full</userinput></para> + <listitem> + <para><option>-unlimited-errors</option> + - defeat the "qmanager threshhold" check for runaway + builds. You want this primarily when doing a + <option>-restart</option> of a build that you expect to mostly + fail, or perhaps a <option>-trybroken</option> run. By default, + the threshhold check is done.</para> + </listitem> + </itemizedlist> - <para>When a new build is created, the directories <filename>errors/</filename>, - <filename>logs/</filename>, <filename>packages/</filename>, and so - forth, are cleaned by the scripts. If you are short of space, - you can also clean out <filename>ports/distfiles/</filename>. - Leave the <filename>latest/</filename> directory alone; it is - a symlink for the webserver.</para> + <para>Unless you specify <option>-restart</option>, + <option>-continue</option>, or <option>-finish</option>, + the symlinks for the existing builds will be rotated. i.e, + the existing symlink for <filename>previous</filename> will + be deleted; the most recent build will have its symlink changed + to <filename>previous/</filename>; and a new build will be + created and symlinked into <filename>latest/</filename>.</para> + + <para>If the last build finished cleanly you do not need to delete + anything. If it was interrupted, or you selected + <option>-nocleanup</option>, you need to clean up clients by running</para> + + <screen>&prompt.user; <userinput>build cleanup <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable> -full</userinput></screen> + + <para>When a new build is created, the directories <filename>errors/</filename>, + <filename>logs/</filename>, <filename>packages/</filename>, and so + forth, are cleaned by the scripts. If you are short of space, + you can also clean out <filename>ports/distfiles/</filename>. + Leave the <filename>latest/</filename> directory alone; it is + a symlink for the webserver.</para> - <note> - <para><literal>dosetupnodes</literal> is supposed to be run from - the <literal>dopackages</literal> script in the - <literal>-restart</literal> case, but it can be a good idea to - run it by hand and then verify that the clients all have the - expected job load. Sometimes, - <literal>dosetupnode</literal> cannot clean up a build and you - need to do it by hand. (This is a bug.)</para> - </note> + <note> + <para><literal>dosetupnodes</literal> is supposed to be run from + the <literal>dopackages</literal> script in the + <option>-restart</option> case, but it can be a good idea to + run it by hand and then verify that the clients all have the + expected job load. Sometimes, + <filename>dosetupnode</filename> cannot clean up a build and you + need to do it by hand. (This is a bug.)</para> + </note> - <para>Make sure the <replaceable>${arch}</replaceable> build - is run as the ports-<replaceable>${arch}</replaceable> user - or it will complain loudly.</para> - - <note><para>The actual package build itself occurs in two - identical phases. The reason for this is that sometimes - transient problems (e.g., NFS failures, FTP sites being - unreachable, etc.) may halt a build. Doing things - in two phases is a workaround for these types of - problems.</para></note> - - <para>Be careful that <filename>ports/Makefile</filename> - does not specify any empty subdirectories. This is especially - 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 - <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/journal</filename>: - </para> + <para>Make sure the <replaceable>${arch}</replaceable> build + is run as the ports-<replaceable>${arch}</replaceable> user + or it will complain loudly.</para> - <programlisting><literal>don't know how to make dns-all(continuing)</literal></programlisting> + <note> + <para>The actual package build itself occurs in two + identical phases. The reason for this is that sometimes + transient problems (e.g., NFS failures, FTP sites being + unreachable, etc.) may halt a build. Doing things + in two phases is a workaround for these types of + problems.</para> + </note> - <para>To correct this problem, simply comment out or remove - the <literal>SUBDIR</literal> entries that point to empty - subdirectories. After doing this, you can restart the build - by running the proper <command>dopackages</command> command - with the <literal>-restart</literal> option. - </para> + <para>Be careful that <filename>ports/Makefile</filename> + does not specify any empty subdirectories. This is especially + 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 + <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/journal</filename>:</para> + + <screen>don't know how to make dns-all(continuing)</screen> + + <para>To correct this problem, simply comment out or remove + the <makevar>SUBDIR</makevar> entries that point to empty + subdirectories. After doing this, you can restart the build + by running the proper <command>dopackages</command> command + with the <option>-restart</option> 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> + <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> - <example> - <title>Update the i386-7 tree and do a complete build</title> + <example> + <title>Update the i386-7 tree and do a complete build</title> - <screen>&prompt.user; <userinput>dopackages.7 i386 -nosrc -norestr -nofinish</userinput> -&prompt.user; <userinput>dopackages.wrapper i386 7 -nosrc -norestr -nofinish</userinput></screen> - </example> + <screen>&prompt.user; <userinput>dopackages.wrapper i386 7 -nosrc -norestr -nofinish</userinput></screen> + </example> - <example> - <title>Restart an interrupted amd64-8 build without updating</title> + <example> + <title>Restart an interrupted amd64-8 build without updating</title> - <screen>&prompt.user; <userinput>dopackages.8 amd64 -nosrc -noports -norestr -continue -noindex -noduds -nofinish</userinput> -&prompt.user; <userinput>dopackages.wrapper amd64 8 -nosrc -noports -norestr -continue -noindex -noduds -nofinish</userinput></screen> - </example> + <screen>&prompt.user; <userinput>dopackages.wrapper amd64 8 -nosrc -noports -norestr -continue -noindex -noduds -nofinish</userinput></screen> + </example> - <example> - <title>Post-process a completed sparc64-7 tree</title> + <example> + <title>Post-process a completed sparc64-7 tree</title> - <screen>&prompt.user; <userinput>dopackages.7 sparc64 -finish</userinput> -&prompt.user; <userinput>dopackages.wrapper sparc64 7 -finish</userinput></screen> - </example> + <screen>&prompt.user; <userinput>dopackages.wrapper sparc64 7 -finish</userinput></screen> + </example> - <para>Hint: it is usually best to run the <command>dopackages</command> - command inside of <command>screen(1)</command>.</para> - </sect3> + <para>Hint: it is usually best to run the <command>dopackages</command> + command inside of <command>screen(1)</command>.</para> </sect2> <sect2 id="build-command"> @@ -723,10 +618,7 @@ PKG_BIN=/usr/local/sbin/pkg</programlist <replaceable>branch</replaceable> [<replaceable>newid</replaceable>]</literal> - Creates <replaceable>newid</replaceable> (or a datestamp if not specified). - Only needed when bringing up a new branch or a new architecture. - (TODO: document whether newid must be specified as - <literal>latest</literal> in the new codebase.) - </para> + Only needed when bringing up a new branch or a new architecture.</para> </listitem> <listitem> @@ -734,8 +626,7 @@ PKG_BIN=/usr/local/sbin/pkg</programlist <replaceable>branch</replaceable> <replaceable>oldid</replaceable> [<replaceable>newid</replaceable>]</literal> - Clones <replaceable>oldid</replaceable> to - <replaceable>newid</replaceable> (or a datestamp if not specified). - </para> + <replaceable>newid</replaceable> (or a datestamp if not specified).</para> </listitem> <listitem> @@ -744,8 +635,7 @@ PKG_BIN=/usr/local/sbin/pkg</programlist <replaceable>buildid</replaceable></literal> - Replaces the src tree with a new ZFS snapshot. Do not forget to use <literal>-nosrc</literal> flag to <command>dopackages</command> - later! - </para> + later!</para> </listitem> <listitem> @@ -754,10 +644,8 @@ PKG_BIN=/usr/local/sbin/pkg</programlist <replaceable>buildid</replaceable></literal> - Replaces the ports tree with a new ZFS snapshot. Do not forget to use <literal>-noports</literal> flag to <command>dopackages</command> - later! - </para> + later!</para> </listitem> - </itemizedlist> </sect2> @@ -768,7 +656,7 @@ PKG_BIN=/usr/local/sbin/pkg</programlist package set. This can be accomplished with the following invocation:</para> - <para>&prompt.root; <command><replaceable>path</replaceable>/qmanager/packagebuild <replaceable>amd64</replaceable> <replaceable>7-exp</replaceable> <replaceable>20080904212103</replaceable> <replaceable>aclock-0.2.3_2.tbz</replaceable></command></para> + <screen>&prompt.root; <command><replaceable>path</replaceable>/qmanager/packagebuild <replaceable>amd64</replaceable> <replaceable>7-exp</replaceable> <replaceable>20080904212103</replaceable> <replaceable>aclock-0.2.3_2.tbz</replaceable></command></screen> </sect2> </sect1> @@ -781,88 +669,72 @@ PKG_BIN=/usr/local/sbin/pkg</programlist <orderedlist> <listitem> - <para>An update of the current <literal>ports</literal> - tree from the ZFS snapshot [*] - </para> + <para>An update of the current <filename>ports</filename> + tree from the ZFS snapshot<footnote id="footnote-status1"> + <para>Status of these steps can be found in + <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/build.log</filename> + as well as on stderr of the tty running the + <command>dopackages</command> command.</para></footnote></para> </listitem> <listitem> <para>An update of the running branch's - <literal>src</literal> tree from the ZFS snapshot [*] - </para> + <filename>src</filename> tree from the ZFS snapshot<footnoteref linkend='footnote-status1'></footnoteref></para> </listitem> <listitem> <para>Checks which ports do not have a - <literal>SUBDIR</literal> entry in their respective - category's <filename>Makefile</filename> [*] - </para> + <makevar>SUBDIR</makevar> entry in their respective + category's <filename>Makefile</filename><footnoteref linkend='footnote-status1'></footnoteref></para> </listitem> <listitem> <para>Creates the <filename>duds</filename> file, which - is a list of ports not to build [*] [+] - </para> + is a list of ports not to build<footnoteref linkend='footnote-status1'></footnoteref><footnote id="footnote-buildstop"> + <para>If any of these steps fail, the build will stop + cold in its tracks.</para></footnote></para> </listitem> <listitem> <para>Generates a fresh <filename>INDEX</filename> - file [*] [+] - </para> + file<footnoteref linkend='footnote-status1'></footnoteref><footnoteref linkend='footnote-buildstop'></footnoteref></para> </listitem> <listitem> <para>Sets up the nodes that will be used in the - build [*] [+] - </para> + build<footnoteref linkend='footnote-status1'></footnoteref><footnoteref linkend='footnote-buildstop'></footnoteref></para> </listitem> <listitem> - <para>Builds a list of restricted ports [*] [+]</para> + <para>Builds a list of restricted ports<footnoteref linkend='footnote-status1'></footnoteref><footnoteref linkend='footnote-buildstop'></footnoteref></para> </listitem> <listitem> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301121914.r0CJE5N0037672>