From owner-svn-doc-all@FreeBSD.ORG Wed Dec 12 22:39:57 2012 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 08DB22B8; Wed, 12 Dec 2012 22:39:57 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id DD6278FC08; Wed, 12 Dec 2012 22:39:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBCMducI068249; Wed, 12 Dec 2012 22:39:56 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBCMdtQ4068240; Wed, 12 Dec 2012 22:39:55 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201212122239.qBCMdtQ4068240@svn.freebsd.org> From: Glen Barber Date: Wed, 12 Dec 2012 22:39:55 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-translations@freebsd.org Subject: svn commit: r40368 - in translations/en_US.ISO8859-1: articles/committers-guide articles/contributing articles/contributors articles/portbuild books books/arch-handbook/driverbasics books/arch-hand... X-SVN-Group: doc-translations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2012 22:39:57 -0000 Author: gjb Date: Wed Dec 12 22:39:55 2012 New Revision: 40368 URL: http://svnweb.freebsd.org/changeset/doc/40368 Log: Merged /projects/pkgng/en_US.ISO8859-1:r39915-40152 to translations/en_US.ISO8859-1 Merged /head/en_US.ISO8859-1:r39641,39937-40365 to translations/en_US.ISO8859-1 Added: translations/en_US.ISO8859-1/htdocs/google6bb24ed0b804d5e9.html - copied unchanged from r40365, head/en_US.ISO8859-1/htdocs/google6bb24ed0b804d5e9.html translations/en_US.ISO8859-1/htdocs/news/2012-compromise/ - copied from r40365, head/en_US.ISO8859-1/htdocs/news/2012-compromise/ translations/en_US.ISO8859-1/htdocs/news/2012-compromise.xml - copied unchanged from r40365, head/en_US.ISO8859-1/htdocs/news/2012-compromise.xml Deleted: translations/en_US.ISO8859-1/books/corp-net-guide/ Modified: translations/en_US.ISO8859-1/articles/committers-guide/article.xml translations/en_US.ISO8859-1/articles/contributing/article.xml translations/en_US.ISO8859-1/articles/contributors/contrib.additional.xml translations/en_US.ISO8859-1/articles/contributors/contrib.committers.xml translations/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml translations/en_US.ISO8859-1/articles/portbuild/article.xml translations/en_US.ISO8859-1/books/Makefile translations/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.xml translations/en_US.ISO8859-1/books/arch-handbook/sound/chapter.xml translations/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml translations/en_US.ISO8859-1/books/developers-handbook/tools/chapter.xml translations/en_US.ISO8859-1/books/faq/book.xml translations/en_US.ISO8859-1/books/handbook/basics/chapter.xml translations/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.xml translations/en_US.ISO8859-1/books/handbook/eresources/chapter.xml translations/en_US.ISO8859-1/books/handbook/filesystems/chapter.xml translations/en_US.ISO8859-1/books/handbook/geom/chapter.xml translations/en_US.ISO8859-1/books/handbook/mac/chapter.xml translations/en_US.ISO8859-1/books/handbook/mail/chapter.xml translations/en_US.ISO8859-1/books/handbook/mirrors/chapter.xml translations/en_US.ISO8859-1/books/handbook/network-servers/chapter.xml translations/en_US.ISO8859-1/books/handbook/ports/chapter.xml translations/en_US.ISO8859-1/books/handbook/virtualization/chapter.xml translations/en_US.ISO8859-1/books/porters-handbook/book.xml translations/en_US.ISO8859-1/htdocs/Makefile translations/en_US.ISO8859-1/htdocs/administration.xml translations/en_US.ISO8859-1/htdocs/art.xml translations/en_US.ISO8859-1/htdocs/cgi/cvsweb.cgi translations/en_US.ISO8859-1/htdocs/cgi/man.cgi translations/en_US.ISO8859-1/htdocs/cgi/ports.cgi translations/en_US.ISO8859-1/htdocs/developers/cvs.xml translations/en_US.ISO8859-1/htdocs/docs/books.xml translations/en_US.ISO8859-1/htdocs/donations/index.xml translations/en_US.ISO8859-1/htdocs/index.xsl translations/en_US.ISO8859-1/htdocs/internal/bylaws.xml translations/en_US.ISO8859-1/htdocs/internal/homepage.pl translations/en_US.ISO8859-1/htdocs/internal/i18n.xml translations/en_US.ISO8859-1/htdocs/layout/css/layout.css translations/en_US.ISO8859-1/htdocs/layout/js/google.js translations/en_US.ISO8859-1/htdocs/news/Makefile translations/en_US.ISO8859-1/htdocs/news/status/report-2001-08.xml translations/en_US.ISO8859-1/htdocs/news/status/report-2002-05-2002-06.xml translations/en_US.ISO8859-1/htdocs/platforms/arm.xml translations/en_US.ISO8859-1/htdocs/releng/charter.xml translations/en_US.ISO8859-1/htdocs/releng/index.xml translations/en_US.ISO8859-1/htdocs/search/sitemap.xml translations/en_US.ISO8859-1/htdocs/security/security.xml translations/en_US.ISO8859-1/htdocs/where.xml translations/en_US.ISO8859-1/share/xml/mailing-lists.ent Directory Properties: translations/en_US.ISO8859-1/ (props changed) Modified: translations/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- translations/en_US.ISO8859-1/articles/committers-guide/article.xml Wed Dec 12 22:39:39 2012 (r40367) +++ translations/en_US.ISO8859-1/articles/committers-guide/article.xml Wed Dec 12 22:39:55 2012 (r40368) @@ -370,7 +370,7 @@ Getting Started - There are three ways to obtain a working copy of the tree + There are a few ways to obtain a working copy of the tree from Subversion. This section will explain them. @@ -466,119 +466,6 @@ information on how to set one up. - - Checkout from a Local Mirror Using - <acronym>SVK</acronym> - - The third alternative is to use SVK - to maintain a local mirror. It is a version control system - build on top of Subversion's storage engine. It is - identical to Subversion in most respects, except that it - allows for setting up parts of repositories as mirrors of - other repositories, and keeping local branches for merging - back into the upstream repositories. There are extensions - that allow SVK to mirror - CVS and Perforce repositories in addition - to Subversion ones. - - Like everything, SVK has its - disadvantages, one being that local revision numbers will - not match upstream revision numbers. This makes it - difficult to svk log, svk - diff, or svk update to an - arbitrary upstream revision. - - To set up a mirror of the &os; repository, do: - - &prompt.user; svk mirror svn+ssh://svn.freebsd.org/base //freebsd/base - - The local SVK repository will be - stored in ~/.svk/local/, but can be - moved to an alternate location. If it is moved, - ~/.svk/config should be amended - manually to reflect the move. - - Any path can be used, not just the one in the example - above. A common pattern is to place mirrors under - //mirror, e.g., - //mirror/freebsd/base/, and - local branches under //local. - - To pull down the contents of the repository to the - mirror: - - &prompt.user; svk sync //freebsd/base - - - svk sync will take a very long - time, possibly several days over a slow network - connection. &a.peter; has a tarball that can be used to - jumpstart the mirror, but only if one does not exist - already. - - - To use the tarball referenced above: - - &prompt.user; cd ~ -&prompt.user; scp freefall:/home/peter/dot_svk_r179646.tbz2 . -&prompt.user; tar xf dot_svk_r179646.tbz2 - - Then edit ~/.svk/config and replace - /scratch/tmp/peter/.svk/local/ - with the equivalent of /home/jarjar/.svk/local/. - - You can check out files directly from your mirror, once - it has been created: - - &prompt.user; svk checkout //freebsd/base/head /usr/src - - Unlike SVN, SVK - does not store metadata or reference copies in the working - copy. All metadata is recorded in - ~/.svk/config; reference copies are not - used at all because SVK always operates - on a local repository. - - When committing from a working copy like the one above, - SVN will commit directly to the upstream - repository, then synchronise the mirror. - - However, the killer app for - SVK is the ability to work without a - network connection. To do that, a local branch must be set - up: - - &prompt.user; svk mkdir //local/freebsd -&prompt.user; svk copy //freebsd/base/head //local/freebsd/head - - Once again, any path can be used, it does not have to - specifically be the one in the example. - - Before use, the local branch has to be synchronized, - like so: - - &prompt.user; svk pull //local/freebsd/head - - Then check out from the newly created local - branch: - - &prompt.user; svk checkout //local/freebsd/head /usr/src - - The point of this exercise is showing that it is - possible to commit work-in-progress to a local branch, and - only push it to the upstream repository when work is - complete. The easy way to push is with svk - push, but there is a serious disadvantage to it: - it will push every single commit made to the local branch - incrementally instead of lumping them all into a single - commit. Therefore, using svk smerge is - preferable. - - <literal>RELENG_*</literal> Branches and General Layout @@ -711,16 +598,6 @@ daily use, except for the revision renumbering mentioned earlier. - - SVN and SVK - commands that have direct CVS equivalents - usually have the same name and abbreviations. For example: - checkout and co, - update and up, and - commit and - ci. - - Help @@ -824,11 +701,7 @@ &prompt.user; svn status - CVS has no direct equivalent of this - command. The nearest would be cvs up -N - which shows local changes and files that are out-of-date. - Doing this in SVN is possible too, - however: + To show local changes and files that are out-of-date do: &prompt.user; svn status --show-updates @@ -836,7 +709,7 @@ Editing and Committing - Like CVS but unlike Perforce, + Unlike Perforce, SVN and SVK do not need to be told in advance about file editing. @@ -882,7 +755,7 @@ - As with CVS, files are added to a + Files are added to a SVN repository with svn add. To add a file named foo, edit it, then: @@ -910,10 +783,9 @@ &prompt.user; svn mkdir bar - In CVS, the directory is immediately - created in the repository when you cvs - add it; this is not the case in Subversion. - Furthermore, unlike CVS, Subversion + The directory is not immediately + created in the repository when you use svn + mkdir. Subversion allows directories to be removed using svn rm, however there is no svn rmdir: @@ -938,9 +810,6 @@ &prompt.user; svn copy foo.c bar.c &prompt.user; svn remove foo.c - - Neither of these operations have equivalents in - CVS. @@ -965,11 +834,11 @@ svn diff displays changes to the working copy of the repository. Diffs generated by - SVN are unified by default, unlike - CVS, and include new files by default + SVN are unified + and include new files by default in the diff output. - As with CVS, svn + svn diff can show the changes between two revisions of the same file: @@ -987,8 +856,8 @@ Reverting Local changes (including additions and deletions) can be - reverted using svn revert. Unlike - cvs up -C, it does not update out-of-date + reverted using svn revert. + It does not update out-of-date files—it just replaces them with pristine copies of the original version. @@ -1877,8 +1746,8 @@ U stable/9/share/man/man4/netmap.4 of svn status and svn diff before committing. - Mistakes will happen, but, unlike with - CVS, they can generally be fixed without + Mistakes will happen but, + they can generally be fixed without disruption. Take a case of adding a file in the wrong location. The @@ -2014,37 +1883,20 @@ U stable/9/share/man/man4/netmap.4 Don't remove and re-add the same file in a single commit as this will break the CVS exporter. - Speeding up checkouts and minimising network traffic is - possible with the following recipe: + Speeding up svn is + possible by adding the following to ~/.ssh/config: + + Host * +ControlPath ~/.ssh/sockets/master-%l-%r@%h:%p +ControlMaster auto +ControlPersist yes - &prompt.user; svn co --depth=empty svn+ssh://svn.freebsd.org/base fbsvn -&prompt.user; cd fbsvn -&prompt.user; svn up --depth=empty stable -&prompt.user; svn up head -&prompt.user; cd stable -&prompt.user; cp -r ../head/ 7 -&prompt.user; cd 7 -&prompt.user; svn switch svn+ssh://svn.freebsd.org/base/stable/7 -&prompt.user; cd .. -&prompt.user; cp -r 7/ 6 -&prompt.user; cd 6 -&prompt.user; svn switch svn+ssh://svn.freebsd.org/base/stable/6 - - What this bit of evil does is check out head, stable/7 and - stable/6. We create the empty checkout directories under - SVN's control. In SVN, - subtrees are self identifying, like in CVS. - We check out head and clone it as stable/7. Except we don't - want the head version so we switch it to the - 7.x tree location. SVN downloads diffs to - convert the head files to - stable/7 instead of doing a fresh checkout. - The same goes for stable/6. This does, however, definitely - count as abuse of the working copy client code! + and then typing + mkdir ~/.ssh/sockets Checking out a working copy with a stock Subversion client without &os;-specific patches - (WITH_FREEBSD_TEMPLATE) will mean that + (OPTIONS_SET=FREEBSD_TEMPLATE) will mean that $FreeBSD$ tags will not be expanded. Once the correct version has been installed, trick Subversion into expanding them like so: @@ -2052,8 +1904,7 @@ U stable/9/share/man/man4/netmap.4 &prompt.user; svn propdel -R svn:keywords . &prompt.user; svn revert -R . - This is not a good idea if uncommitted patches exist, - however. + This will wipe out uncommitted patches. @@ -2081,7 +1932,7 @@ U stable/9/share/man/man4/netmap.4 Add your author entity to - head/en_US.ISO8859-1/share/xml/authors.ent; + head/share/xml/authors.ent; this should be done first since an omission of this commit will cause the next commits to break the doc/ build. @@ -2594,14 +2445,13 @@ U stable/9/share/man/man4/netmap.4 &a.committers; - cvs-committers is the entity that the version control system uses to send you all your - commit messages. You should never send email - directly to this list. You should only send replies to this list - when they are short and are directly related to a commit. - - There is a similar list, svn-committers, which has a - similar purpose but is a normal list, i.e., you are free to - send any suitable message to this list. + &a.svn-src-all.name;, &a.svn-ports-all.name; and + &a.svn-doc-all.name; are the mailing lists that the + version control system uses to send commit messages to. + You should never send email directly + to these lists. You should only send replies to this list + when they are short and are directly related to a + commit. @@ -4074,57 +3924,11 @@ U stable/9/share/man/man4/netmap.4 - Update the instructions for &man.cvsup.1;: - - - - - add the category to - distrib/cvsup/sup/README - - - - - - adding the following files into - distrib/cvsup/sup/ports-categoryname: - list.cvs and - releases. - - - - - add the category to - src/share/examples/cvsup/ports-supfile - - - - - - (Note: these are - in the src, not the ports, repository). If you - are not a src committer, you will need to submit - a PR for this. - - - - - Update the list of categories used by &man.sysinstall.8; - in src/usr.sbin/sysinstall. - - - Update the documentation by modifying the following: - the section of the Handbook that lists the - - cvsup collections. - - - the list of categories in the Porter's Handbook @@ -4174,10 +3978,6 @@ U stable/9/share/man/man4/netmap.4 - src/usr.sbin/sysinstall - - - the list of categories in the Porter's Handbook Modified: translations/en_US.ISO8859-1/articles/contributing/article.xml ============================================================================== --- translations/en_US.ISO8859-1/articles/contributing/article.xml Wed Dec 12 22:39:39 2012 (r40367) +++ translations/en_US.ISO8859-1/articles/contributing/article.xml Wed Dec 12 22:39:55 2012 (r40368) @@ -234,7 +234,8 @@ Pick one of the items from the <quote>Ideas</quote> page - The &os; list of + The &os; + list of projects and ideas for volunteers is also available for people willing to contribute to the &os; project. The list is being regularly updated and contains items for both @@ -342,39 +343,22 @@ The preferred &man.diff.1; format for submitting patches is the unified output format generated by diff - -u. However, for patches that substantially - change a region of code, a context output format diff - generated by diff -c may be more readable - and thus preferable. + -u. diff - For example: - - &prompt.user; diff -c oldfile newfile - - or - - &prompt.user; diff -c -r olddir newdir - - would generate such a set of context diffs for the given - source file or directory hierarchy. - - Likewise, - &prompt.user; diff -u oldfile newfile or - &prompt.user; diff -u -r olddir newdir + &prompt.user; diff -u -r -N olddir newdir - would do the same, except in the unified diff - format. + would generate a set of unified diffs for the given source + file or directory hierarchy. - See the manual page for &man.diff.1; for more - details. + See &man.diff.1; for more information. Once you have a set of diffs (which you may test with the &man.patch.1; command), you should submit them for inclusion @@ -400,9 +384,8 @@ welcome. If your change is of a potentially sensitive nature, - e.g. you are unsure of copyright issues governing its further - distribution or you are simply not ready to release it without - a tighter review first, then you should send it to &a.core; + such as if you are unsure of copyright issues governing its further + distribution then you should send it to &a.core; directly rather than submitting it with &man.send-pr.1;. The &a.core; reaches a much smaller group of people who do much of the day-to-day work on FreeBSD. Note that this @@ -506,7 +489,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - $Id$ + $&os;$ For your convenience, a copy of this text can be found in /usr/share/examples/etc/bsd-style-copyright. Modified: translations/en_US.ISO8859-1/articles/contributors/contrib.additional.xml ============================================================================== --- translations/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Wed Dec 12 22:39:39 2012 (r40367) +++ translations/en_US.ISO8859-1/articles/contributors/contrib.additional.xml Wed Dec 12 22:39:55 2012 (r40368) @@ -1144,11 +1144,6 @@ - Barbara - - - - Barry Bierbauch pivrnec@vszbr.cz @@ -1722,6 +1717,11 @@ + Christian Heckendorf + heckend@bu.edu + + + Christian Lackas delta@lackas.net Modified: translations/en_US.ISO8859-1/articles/contributors/contrib.committers.xml ============================================================================== --- translations/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Wed Dec 12 22:39:39 2012 (r40367) +++ translations/en_US.ISO8859-1/articles/contributors/contrib.committers.xml Wed Dec 12 22:39:55 2012 (r40368) @@ -500,6 +500,10 @@ + &a.bar; + + + &a.jmg; @@ -1524,6 +1528,10 @@ + &a.bryanv; + + + &a.avilla; @@ -1638,4 +1646,8 @@ &a.az; + + + &a.syuu; + Modified: translations/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml ============================================================================== --- translations/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml Wed Dec 12 22:39:39 2012 (r40367) +++ translations/en_US.ISO8859-1/articles/contributors/contrib.corealumni.xml Wed Dec 12 22:39:55 2012 (r40368) @@ -3,6 +3,10 @@ + &a.attilio; (2012) + + + &a.wilko; (2006 - 2012) Modified: translations/en_US.ISO8859-1/articles/portbuild/article.xml ============================================================================== --- translations/en_US.ISO8859-1/articles/portbuild/article.xml Wed Dec 12 22:39:39 2012 (r40367) +++ translations/en_US.ISO8859-1/articles/portbuild/article.xml Wed Dec 12 22:39:55 2012 (r40368) @@ -66,19 +66,23 @@ otherwise specified, all paths will be relative to this location. ${arch} will be used to specify one of the package architectures - (amd64, &i386;, ia64, powerpc, and &sparc64;), and + (e.g., amd64, arm, &i386;, ia64, powerpc, &sparc64;), and ${branch} will be used - to specify the build branch (7, 7-exp, 8, 8-exp, 9, 9-exp, 10, 10-exp). + to specify the build branch (e.g., 7, 7-exp, 8, 8-exp, 9, 9-exp, 10, 10-exp). + The set of branches that portmgr currently + supports is the same as those that the &os; + security team + supports. - Packages are no longer built for Releases 4, 5, or 6, nor + Packages are no longer built for branches 4, 5, or 6, nor for the alpha architecture. The scripts that control all of this live in /var/portbuild/scripts/. - These are the checked-out copies from the Subversion repository + These are the checked-out copies from the Subversion repository at base/projects/portbuild/scripts/ . @@ -95,16 +99,19 @@ -CURRENT - for experimental builds + for experimental ("exp-") builds + + Packages from experimental builds are not uploaded. + Notes on the codebase Until mid-2010, the scripts were completely specific to - pointyhat as the head (dispatch) node. During + pointyhat.FreeBSD.org as the head (dispatch) node. During the summer of 2010, a significant rewrite was done in order to allow for other hosts to be head nodes. Among the changes were: @@ -136,9 +143,11 @@ to old codebase:. - As of December 2010, pointyhat is still - running on the old codebase, until the new codebase is considered - rock-solid. + Up until November 2012, pointyhat 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 obsolete, + and will be removed in the near future. @@ -167,7 +176,7 @@ 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. + nullfs-mounted for jail builds. The ports-${arch} @@ -179,41 +188,32 @@ The scripts/allgohans script can be used to run a command on all of the ${arch} clients. - - The scripts/checkmachines script - is used to monitor the load on all the nodes of the - build cluster, and schedule which nodes build which ports. - This script is not very robust, and has a tendency to die. - It is best to start up this script on the build master - (e.g. pointyhat) - after boot time using a &man.while.1; loop. - - Chroot Build Environment Setup + Jail Build Environment Setup Package builds are performed in a - chroot populated by the + jail populated by the portbuild script using the ${arch}/${branch}/builds/${buildid}/bindist.tar file. - The following command builds a world from the + The makeworld command builds a world from the ${arch}/${branch}/builds/${buildid}/src/ tree and installs it into - ${worlddir}. The tree will - be updated first unless -nocvs is - specified. + ${arch}/${branch}/builds/${buildid}/bindist.tar. + The tree will + be updated first unless -novcs is + specified. It should be run as root: - /var/portbuild&prompt.root; scripts/makeworld ${arch} ${branch} ${buildid} [-nocvs] + &prompt.root; /var/portbuild/scripts/makeworld ${arch} ${branch} ${buildid} [-novcs] The bindist.tar tarball is created from the previously installed world by the mkbindist - script. It should be run as root with the following - command: + script. It should be also be run as root: - /var/portbuild&prompt.root; scripts/mkbindist ${arch} ${branch} ${buildid} + &prompt.root; /var/portbuild/scripts/mkbindist ${arch} ${branch} ${buildid} The per-machine tarballs are located in ${arch}/clients. @@ -280,7 +280,7 @@ (For this case, the contents are identical for both server and client.) - RUBY_DEFAULT_VER= 1.9 + RUBY_DEFAULT_VER= 1.9 @@ -291,7 +291,7 @@ (For this case, the contents are also identical for both server and client.) - + .if !defined(CC) || ${CC} == "cc" CC=clang .endif @@ -301,44 +301,45 @@ CXX=clang++ .if !defined(CPP) || ${CPP} == "cpp" CPP=clang-cpp .endif -# Don't die on warnings +# Do not die on warnings NO_WERROR= WERROR= - + Sample <filename>make.conf.server</filename> for <application>pkgng</application> - WITH_PKGNG=yes -PKG_BIN=/usr/local/sbin/pkg + WITH_PKGNG=yes +PKG_BIN=/usr/local/sbin/pkg Sample <filename>make.conf.client</filename> for <application>pkgng</application> - WITH_PKGNG=yes + WITH_PKGNG=yes Sample <filename>src.conf.server</filename> to test new <application>sort</application> codebase - WITH_BSD_SORT=yes + WITH_BSD_SORT=yes Starting the Build - Several separate builds for each architecture - branch combination + Separate builds for various combinations of architecture and branch are supported. All data private to a build (ports tree, src tree, - packages, distfiles, log files, bindist, Makefile, etc) are located under - ${arch}/${branch}/builds/${buildid}. - The last created build can be alternatively referenced under buildid - latest, the one before is called + packages, distfiles, log files, bindist, Makefile, etc) are located under the + ${arch}/${branch}/builds/${buildid}/ + directory. + The most recently created build can be alternatively referenced using buildid + latest, and the one before using previous. New builds are cloned from the latest, which is @@ -425,7 +426,7 @@ PKG_BIN=/usr/local/sbin/pkg The symlinks go away, and you just use dopackages.wrapper directly. For example: - dopackages.wrapper ${arch} ${branch} ${buildid} [-options] + &prompt.root; dopackages.wrapper ${arch} ${branch} ${buildid} [-options] @@ -443,7 +444,7 @@ PKG_BIN=/usr/local/sbin/pkg -keep - Do not delete this build in the future, when it would be normally deleted as part of the latest - previous cycle. - Don't forget to clean it up manually when you no longer need it. + Do not forget to clean it up manually when you no longer need it. @@ -451,8 +452,8 @@ PKG_BIN=/usr/local/sbin/pkg -nofinish - 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, don't forget to cleanup - the clients when you don't need the build anymore. + once it finishes. If you use this option, do not forget to cleanup + the clients when you do not need the build any more. @@ -519,7 +520,7 @@ PKG_BIN=/usr/local/sbin/pkg -noduds - Do not rebuild the duds file (ports that are never - built, e.g. those marked IGNORE, + built, e.g., those marked IGNORE, NO_PACKAGE, etc.) during preprocessing. @@ -558,9 +559,9 @@ PKG_BIN=/usr/local/sbin/pkg - -srccvs - Do not update the + -srcvcs - Do not update the src tree from the ZFS snapshot, update it with - cvs update instead. + a fresh checkout instead. @@ -572,9 +573,9 @@ PKG_BIN=/usr/local/sbin/pkg - -portscvs - Do not update the + -portsvcs - Do not update the ports tree from the ZFS snapshot, update it with - cvs update instead. + a fresh checkout instead. @@ -600,7 +601,7 @@ PKG_BIN=/usr/local/sbin/pkg -fetch-original - Fetch the distfile from the original MASTER_SITES - rather than ftp-master. + rather than any cache such as on ftp-master. @@ -628,9 +629,9 @@ PKG_BIN=/usr/local/sbin/pkg -nocleanup, you need to clean up clients by running - build cleanup ${arch} ${branch} ${buildid} -full + &prompt.user; build cleanup ${arch} ${branch} ${buildid} -full - errors/, + When a new build is created, the directories errors/, logs/, packages/, and so forth, are cleaned by the scripts. If you are short of space, you can also clean out ports/distfiles/. @@ -653,7 +654,7 @@ PKG_BIN=/usr/local/sbin/pkg 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 + 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. @@ -664,10 +665,10 @@ PKG_BIN=/usr/local/sbin/pkg process encounters an empty subdirectory, both package build phases will stop short, and an error similar to the following will be written to - ${arch}/${branch}/make.[0|1]: + ${arch}/${branch}/journal: - don't know how to make dns-all(continuing) + don't know how to make dns-all(continuing) To correct this problem, simply comment out or remove the SUBDIR entries that point to empty @@ -685,22 +686,22 @@ PKG_BIN=/usr/local/sbin/pkg Update the i386-7 tree and do a complete build - dopackages.7 i386 -nosrc -norestr -nofinish - dopackages.wrapper i386 7 -nosrc -norestr -nofinish + &prompt.user; dopackages.7 i386 -nosrc -norestr -nofinish +&prompt.user; dopackages.wrapper i386 7 -nosrc -norestr -nofinish Restart an interrupted amd64-8 build without updating - dopackages.8 amd64 -nosrc -noports -norestr -continue -noindex -noduds -nofinish - dopackages.wrapper amd64 8 -nosrc -noports -norestr -continue -noindex -noduds -nofinish + &prompt.user; dopackages.8 amd64 -nosrc -noports -norestr -continue -noindex -noduds -nofinish +&prompt.user; dopackages.wrapper amd64 8 -nosrc -noports -norestr -continue -noindex -noduds -nofinish Post-process a completed sparc64-7 tree - dopackages.7 sparc64 -finish - dopackages.wrapper sparc64 7 -finish + &prompt.user; dopackages.7 sparc64 -finish +&prompt.user; dopackages.wrapper sparc64 7 -finish Hint: it is usually best to run the dopackages @@ -741,7 +742,7 @@ PKG_BIN=/usr/local/sbin/pkg build srcupdate arch branch buildid - Replaces the src - tree with a new ZFS snapshot. Don't forget to use + tree with a new ZFS snapshot. Do not forget to use -nosrc flag to dopackages later! @@ -751,7 +752,7 @@ PKG_BIN=/usr/local/sbin/pkg build portsupdate arch branch buildid - Replaces the ports - tree with a new ZFS snapshot. Don't forget to use + tree with a new ZFS snapshot. Do not forget to use -noports flag to dopackages later! @@ -767,7 +768,7 @@ PKG_BIN=/usr/local/sbin/pkg package set. This can be accomplished with the following invocation: - path/qmanager/packagebuild amd64 7-exp 20080904212103 aclock-0.2.3_2.tbz + &prompt.root; path/qmanager/packagebuild amd64 7-exp 20080904212103 aclock-0.2.3_2.tbz @@ -846,9 +847,9 @@ PKG_BIN=/usr/local/sbin/pkg ${arch}/${branch}/journal (new codebase). Individual ports will write their build logs to - ${arch}/${branch}/logs + ${arch}/${branch}/logs/ and their error logs to - ${arch}/${branch}/errors. + ${arch}/${branch}/errors/. Formerly the docs tree was also checked out, however, it has @@ -886,7 +887,7 @@ PKG_BIN=/usr/local/sbin/pkg identify the tty in which it's running (either record the output of &man.tty.1; when you start the build, or use ps x to identify it. You need to make sure that nothing else important - is running in this tty, e.g. ps -t p1 or whatever. + is running in this tty, e.g., ps -t p1 or whatever. If there is not, you can just kill off the whole term easily with pkill -t pts/1; otherwise issue a kill -HUP in there by, for example, @@ -911,11 +912,11 @@ PKG_BIN=/usr/local/sbin/pkg Cleaning up a Build To free up resources, you will need to clean up client machines by - running build cleanup command. For example: - &prompt.user; /var/portbuild/scripts/build cleanup i386 8-exp 20080714120411 -full + running build cleanup command. For example: + &prompt.user; /var/portbuild/scripts/build cleanup i386 8-exp 20080714120411 -full If you forget to do this, then the old build - chroots will not be cleaned up for 24 hours, and no + jails will not be cleaned up for 24 hours, and no new jobs will be dispatched in their place since pointyhat thinks the job slot is still occupied. @@ -924,21 +925,21 @@ PKG_BIN=/usr/local/sbin/pkg it thinks is running, and this should be roughly concordant with the load average. loads is refreshed every 2 minutes. If you do ps x | grep pdispatch - and it's less than the number of jobs that loads - thinks are in use, you're in trouble. + and it is less than the number of jobs that loads + thinks are in use, you are in trouble. You may have problem with the umount commands hanging. If so, you are going to have to use the allgohans script to run an &man.ssh.1; - command across all clients for that buildenv. For example: -ssh -l root gohan24 df + command across all clients for that buildenv. For example: +&prompt.user; ssh gohan24 df - will get you a df, and + will get you a df, and -allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/8-exp/ports" -allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/8-exp/src" +&prompt.user; allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/8-exp/ports" +&prompt.user; allgohans "umount -f pointyhat.freebsd.org:/var/portbuild/i386/8-exp/src" - are supposed to get rid of the hanging mounts. You will have to + are supposed to get rid of the hanging mounts. You will have to keep doing them since there can be multiple mounts. @@ -949,8 +950,8 @@ umount: pointyhat.freebsd.org:/var/portb umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed! /x/tmp/8-exp/chroot/53837/compat/linux/proc: not a file system root directory - The former 2 mean that that client did not have those mounted; - the latter 2 are a bug. + The former two mean that the client did not have those mounted; + the latter two are a bug. You may also see messages about procfs. @@ -1006,8 +1007,8 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 You can use qclient command to monitor the status of build nodes, and to list the currently scheduled jobs: - python path/qmanager/qclient jobs - python path/qmanager/qclient status + &prompt.user; python path/qmanager/qclient jobs +&prompt.user; python path/qmanager/qclient status The scripts/stats ${branch} *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***