From owner-svn-doc-all@FreeBSD.ORG Wed Dec 19 18:46:51 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 EDA4CE05; Wed, 19 Dec 2012 18:46:51 +0000 (UTC) (envelope-from linimon@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 CF4548FC14; Wed, 19 Dec 2012 18:46:51 +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 qBJIkpLM060645; Wed, 19 Dec 2012 18:46:51 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBJIkpfY060644; Wed, 19 Dec 2012 18:46:51 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201212191846.qBJIkpfY060644@svn.freebsd.org> From: Mark Linimon Date: Wed, 19 Dec 2012 18:46:51 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r40434 - head/en_US.ISO8859-1/articles/portbuild X-SVN-Group: doc-head 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, 19 Dec 2012 18:46:52 -0000 Author: linimon Date: Wed Dec 19 18:46:51 2012 New Revision: 40434 URL: http://svnweb.freebsd.org/changeset/doc/40434 Log: Start the deorbit burn of the "old codebase" documentation. Glanced at by: rene Modified: head/en_US.ISO8859-1/articles/portbuild/article.xml Modified: head/en_US.ISO8859-1/articles/portbuild/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/portbuild/article.xml Wed Dec 19 18:00:51 2012 (r40433) +++ head/en_US.ISO8859-1/articles/portbuild/article.xml Wed Dec 19 18:46:51 2012 (r40434) @@ -139,15 +139,14 @@ This document was originally written before these changes were made. Where things such as script invocations have changed, - they are denoted as new codebase: as opposed + they were denoted as new codebase: as opposed to old codebase:. 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. + to do with the old codebase have been removed. @@ -224,20 +223,26 @@ script. + For both commands above, if ${buildid} is latest, it may be omitted. + Customizing Your Build + You can customize your build by providing local versions of make.conf and/or @@ -348,9 +353,10 @@ PKG_BIN=/usr/local/sbin/pkg <command>dopackages</command> scripts - The scripts/dopackages scripts - are used to perform the builds. + The scripts/dopackages.wrapper script + is used to perform the builds. + &prompt.root; dopackages.wrapper ${arch} ${branch} ${buildid} [-options] + Most often, you will be using latest for the value of buildid. @@ -546,8 +555,11 @@ PKG_BIN=/usr/local/sbin/pkg With -trybroken, you probably also want to use -fetch-original + + and + -unlimited-errors. @@ -606,8 +618,11 @@ PKG_BIN=/usr/local/sbin/pkg - -unlimited-errors (new codebase - only) - defeat the "qmanager threshhold" check for runaway + -unlimited-errors + + - defeat the "qmanager threshhold" check for runaway builds. You want this primarily when doing a -restart of a build that you expect to mostly fail, or perhaps a -trybroken run. By default, @@ -686,27 +701,38 @@ PKG_BIN=/usr/local/sbin/pkg Update the i386-7 tree and do a complete build - &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 - &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 - &prompt.user; dopackages.7 sparc64 -finish + + &prompt.user; dopackages.wrapper sparc64 7 -finish Hint: it is usually best to run the dopackages command inside of screen(1). + @@ -724,8 +750,10 @@ PKG_BIN=/usr/local/sbin/pkgnewid] - Creates newid (or a datestamp if not specified). Only needed when bringing up a new branch or a new architecture. + @@ -843,8 +871,14 @@ PKG_BIN=/usr/local/sbin/pkg [++] Status of these steps can be found in + + ${arch}/${branch}/journal + + . Individual ports will write their build logs to ${arch}/${branch}/logs/ @@ -852,9 +886,11 @@ PKG_BIN=/usr/local/sbin/pkg${arch}/${branch}/errors/. + @@ -870,7 +906,7 @@ PKG_BIN=/usr/local/sbin/pkg - pointyhat has been rebooted while + The head node has been rebooted while a build was running. @@ -990,11 +1026,13 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 + @@ -1057,7 +1095,7 @@ umount: Cleanup of /x/tmp/8-exp/chroot/5 The status of all current builds is generated periodically - and posted to + into the packagestats.html file, e.g., . For each buildenv, the following is displayed: @@ -2257,7 +2295,11 @@ ssh_cmd="/usr/local/bin/ssh" - (new codebase) Edit /var/portbuild/conf/server.conf + + + Edit /var/portbuild/conf/server.conf with the following changes: @@ -2266,6 +2308,7 @@ ssh_cmd="/usr/local/bin/ssh" SRC_BRANCHES. + - (New codebase) For what was previously head, change + + + For what was previously head, change SRC_BRANCH_branch_SUBDIR to releng/branch.0 (literal zero). - (New codebase) Add + + + Add SRC_BRANCH_new-branch_SUBDIR =head. @@ -2295,10 +2347,15 @@ ssh_cmd="/usr/local/bin/ssh" - (new codebase) Run + + + Run /var/portbuild/updatesnap manually. + (Only necessary for old codebase): Add the snap directory to /var/portbuild/scripts/zexpire. @@ -2364,6 +2420,7 @@ ln -s ../arch ln -s ../arch/branch/builds/latest/packages arch-branch-packages-latest +--> @@ -2413,7 +2470,11 @@ ln -s ../arch - (new codebase) Edit /var/portbuild/conf/server.conf + + + Edit /var/portbuild/conf/server.conf with the following changes: @@ -2430,7 +2491,10 @@ ln -s ../arch - (both): + + umount a/snap/src-old-branch/src; umount a/snap/src-old-branch; zfs destroy -r a/snap/src-old-branch @@ -2439,7 +2503,11 @@ zfs destroy -r a/snap/src-o - (both) You will probably find that the following files and + + + You will probably find that the following files and symlinks in /var/portbuild/errorlogs/ can be removed: @@ -2486,7 +2554,11 @@ zfs destroy -r a/snap/src-o a full (not incremental!) package build should be done and uploaded. - The procedure for the new codebase is as follows: + The procedure + + is as follows: @@ -2579,6 +2651,7 @@ cd /var/portbuild/archarchive/. + For each branch that will be supported, do the following: @@ -2698,15 +2772,20 @@ cd /var/portbuild/arch - (Only necessary for new codebase): + + Add arch to SUPPORTED_ARCHS in /var/portbuild/arch/server.conf. + Add the arch directory to @@ -2714,6 +2793,7 @@ cd /var/portbuild/arch/var/portbuild/scripts/zexpire. + @@ -2781,6 +2862,7 @@ ln -s ../arch + @@ -2799,10 +2882,13 @@ ln -s ../arch How to configure a new head node (pointyhat instance) + - Please talk to Mark Linimon before making any changes. + Please talk to Mark Linimon before making any changes + to this section. Basic installation