From owner-svn-doc-head@FreeBSD.ORG Mon Feb 11 23:21:09 2013 Return-Path: Delivered-To: svn-doc-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id BE9442EC; Mon, 11 Feb 2013 23:21:09 +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 A2B356D7; Mon, 11 Feb 2013 23:21:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1BNL9Y5087841; Mon, 11 Feb 2013 23:21:09 GMT (envelope-from linimon@svn.freebsd.org) Received: (from linimon@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1BNL9Bu087840; Mon, 11 Feb 2013 23:21:09 GMT (envelope-from linimon@svn.freebsd.org) Message-Id: <201302112321.r1BNL9Bu087840@svn.freebsd.org> From: Mark Linimon Date: Mon, 11 Feb 2013 23:21:09 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r40952 - 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-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Feb 2013 23:21:09 -0000 Author: linimon Date: Mon Feb 11 23:21:09 2013 New Revision: 40952 URL: http://svnweb.freebsd.org/changeset/doc/40952 Log: Reflect the fact that src branch definitions have moved to admin/admin.conf, and that makeworld, mkbindist, zbackup, and zexpire have all moved to admin/scripts/ . This fixes up the three sections on dealing with changes to branches, but the "new architecture" section is still a mess. While here, stamp out more uses of /var/portbuild in favor of /a/portbuild. 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 Mon Feb 11 21:50:50 2013 (r40951) +++ head/en_US.ISO8859-1/articles/portbuild/article.xml Mon Feb 11 23:21:09 2013 (r40952) @@ -217,13 +217,13 @@ be updated first unless -novcs is specified. It should be run as root: - &prompt.root; /var/portbuild/scripts/makeworld ${arch} ${branch} ${buildid} [-novcs] + &prompt.root; /a/portbuild/admin/scripts/makeworld ${arch} ${branch} ${buildid} [-novcs] The bindist.tar tarball is created from the previously installed world by the mkbindist script. It should be also be run as root: - &prompt.root; /var/portbuild/scripts/mkbindist ${arch} ${branch} ${buildid} + &prompt.root; /a/portbuild/admin/scripts/mkbindist ${arch} ${branch} ${buildid} The per-machine tarballs are located in ${arch}/clients. @@ -2090,10 +2090,15 @@ ssh_cmd="/usr/local/bin/ssh"HEAD. + + As + srcbuild: + + - Edit /var/portbuild/conf/server.conf + Edit /a/portbuild/conf/admin/admin.conf with the following changes: @@ -2118,7 +2123,7 @@ ssh_cmd="/usr/local/bin/ssh" - Run /var/portbuild/updatesnap manually. + Run /a/portbuild/admin/scripts/updatesnap manually. @@ -2126,24 +2131,21 @@ ssh_cmd="/usr/local/bin/ssh" Steps necessary after <application>qmanager</application> is started - - Again, as - portbuild: - - For each branch that will be supported, do the following: - Kick-start the build for the branch with: + As portbuild, + kick-start the build for the branch with: build create arch branch - Create + As srcbuild, + create bindist.tar. @@ -2160,7 +2162,7 @@ ssh_cmd="/usr/local/bin/ssh" - Edit /var/portbuild/conf/server.conf + Edit /a/portbuild/admin/conf/admin.conf with the following changes: @@ -2187,7 +2189,7 @@ zfs destroy -r a/snap/src-o You will probably find that the following files and - symlinks in /var/portbuild/errorlogs/ + symlinks in /a/portbuild/errorlogs/ can be removed: @@ -2232,7 +2234,7 @@ zfs destroy -r a/snap/src-o - Edit /var/portbuild/conf/server.conf + Edit /a/portbuild/admin/conf/admin.conf with the following changes: @@ -2247,7 +2249,7 @@ zfs destroy -r a/snap/src-o - Run /var/portbuild/updatesnap manually. + Run /a/portbuild/admin/scripts/updatesnap manually. @@ -2270,6 +2272,7 @@ zfs destroy -r a/snap/src-o Steps necessary before <application>qmanager</application> is started + The initial steps need to be done as root. @@ -2283,7 +2286,7 @@ zfs destroy -r a/snap/src-o - mkdir /var/portbuild/arch + mkdir /a/portbuild/arch @@ -2293,9 +2296,9 @@ zfs destroy -r a/snap/src-o - &prompt.root; chown portbuild:portbuild /var/portbuild/arch; -&prompt.root; chmod 775 /var/portbuild/arch; -&prompt.root; cd /var/portbuild/arch + &prompt.root; chown portbuild:portbuild /a/portbuild/arch; +&prompt.root; chmod 775 /a/portbuild/arch; +&prompt.root; cd /a/portbuild/arch @@ -2384,7 +2387,7 @@ zfs destroy -r a/snap/src-o Make a private configuration directory: - &prompt.root; mkdir /var/portbuild/conf/arch + &prompt.root; mkdir /a/portbuild/conf/arch @@ -2402,20 +2405,20 @@ zfs destroy -r a/snap/src-o Add arch to SUPPORTED_ARCHS in - /var/portbuild/conf/server.conf. + /a/portbuild/admin/conf/admin.conf. Add the arch directory to - /var/portbuild/scripts/zbackup and - /var/portbuild/scripts/zexpire. + /a/portbuild/admin/scripts/zbackup and + /a/portbuild/admin/scripts/zexpire. Add an appropriate arch entry for - /var/portbuild/scripts/dologs to the portbuild + /a/portbuild/scripts/dologs to the portbuild crontab. (This is a hack and should go away.)