Date: Mon, 11 Feb 2013 23:21:09 +0000 (UTC) From: Mark Linimon <linimon@FreeBSD.org> 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 Message-ID: <201302112321.r1BNL9Bu087840@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <literal>-novcs</literal> is specified. It should be run as <username>root</username>:</para> - <screen>&prompt.root; <userinput>/var/portbuild/scripts/makeworld <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable> [-novcs]</userinput></screen> + <screen>&prompt.root; <userinput>/a/portbuild/admin/scripts/makeworld <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable> [-novcs]</userinput></screen> <para>The <filename>bindist.tar</filename> tarball is created from the previously installed world by the <command>mkbindist</command> script. It should be also be run as <username>root</username>:</para> - <screen>&prompt.root; <userinput>/var/portbuild/scripts/mkbindist <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable></userinput></screen> + <screen>&prompt.root; <userinput>/a/portbuild/admin/scripts/mkbindist <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable></userinput></screen> <para>The per-machine tarballs are located in <filename><replaceable>${arch}</replaceable>/clients</filename>.</para> @@ -2090,10 +2090,15 @@ ssh_cmd="/usr/local/bin/ssh"</programlis be done to specify that the previous branch is no longer equivalent to <literal>HEAD</literal>.</para> + <note> + <para>As + <literal>srcbuild</literal>:</para> + </note> + <itemizedlist> <listitem> <para> - Edit <filename>/var/portbuild/conf/server.conf</filename> + Edit <filename>/a/portbuild/conf/admin/admin.conf</filename> with the following changes:</para> <itemizedlist> @@ -2118,7 +2123,7 @@ ssh_cmd="/usr/local/bin/ssh"</programlis </listitem> <listitem> - <para>Run <command>/var/portbuild/updatesnap</command> manually.</para> + <para>Run <command>/a/portbuild/admin/scripts/updatesnap</command> manually.</para> </listitem> </itemizedlist> </sect2> @@ -2126,24 +2131,21 @@ ssh_cmd="/usr/local/bin/ssh"</programlis <sect2 id="new-branch-post-qmanager"> <title>Steps necessary after <application>qmanager</application> is started</title> - <note> - <para>Again, as - <literal>portbuild</literal>:</para> - </note> - <itemizedlist> <listitem> <para>For each branch that will be supported, do the following:</para> <itemizedlist> <listitem> - <para>Kick-start the build for the branch with:</para> + <para>As <literal>portbuild</literal>, + kick-start the build for the branch with:</para> <screen>build create <replaceable>arch</replaceable> <replaceable>branch</replaceable></screen> </listitem> <listitem> - <para><link linkend="setup">Create + <para>As <literal>srcbuild</literal>, + <link linkend="setup">create <filename>bindist.tar</filename></link>.</para> </listitem> </itemizedlist> @@ -2160,7 +2162,7 @@ ssh_cmd="/usr/local/bin/ssh"</programlis <itemizedlist> <listitem> - <para>Edit <filename>/var/portbuild/conf/server.conf</filename> + <para>Edit <filename>/a/portbuild/admin/conf/admin.conf</filename> with the following changes:</para> <itemizedlist> @@ -2187,7 +2189,7 @@ zfs destroy -r a/snap/src-<replaceable>o <itemizedlist> <listitem> <para>You will probably find that the following files and - symlinks in <filename>/var/portbuild/errorlogs/</filename> + symlinks in <filename>/a/portbuild/errorlogs/</filename> can be removed:</para> <itemizedlist> @@ -2232,7 +2234,7 @@ zfs destroy -r a/snap/src-<replaceable>o <itemizedlist> <listitem> - <para>Edit <filename>/var/portbuild/conf/server.conf</filename> + <para>Edit <filename>/a/portbuild/admin/conf/admin.conf</filename> with the following changes:</para> <itemizedlist> @@ -2247,7 +2249,7 @@ zfs destroy -r a/snap/src-<replaceable>o </listitem> <listitem> - <para>Run <command>/var/portbuild/updatesnap</command> manually.</para> + <para>Run <command>/a/portbuild/admin/scripts/updatesnap</command> manually.</para> </listitem> <listitem> @@ -2270,6 +2272,7 @@ zfs destroy -r a/snap/src-<replaceable>o <sect2 id="new-arch-pre-qmanager"> <title>Steps necessary before <application>qmanager</application> is started</title> +<!-- XXX MCL addarch --> <note> <para>The initial steps need to be done as <literal>root</literal>.</para> @@ -2283,7 +2286,7 @@ zfs destroy -r a/snap/src-<replaceable>o </listitem> <listitem> - <screen>mkdir /var/portbuild/<replaceable>arch</replaceable></screen> + <screen>mkdir /a/portbuild/<replaceable>arch</replaceable></screen> </listitem> <listitem> @@ -2293,9 +2296,9 @@ zfs destroy -r a/snap/src-<replaceable>o </listitem> <listitem> - <screen>&prompt.root; chown portbuild:portbuild /var/portbuild/<replaceable>arch</replaceable>; -&prompt.root; chmod 775 /var/portbuild/<replaceable>arch</replaceable>; -&prompt.root; cd /var/portbuild/<replaceable>arch</replaceable></screen> + <screen>&prompt.root; chown portbuild:portbuild /a/portbuild/<replaceable>arch</replaceable>; +&prompt.root; chmod 775 /a/portbuild/<replaceable>arch</replaceable>; +&prompt.root; cd /a/portbuild/<replaceable>arch</replaceable></screen> </listitem> <listitem> @@ -2384,7 +2387,7 @@ zfs destroy -r a/snap/src-<replaceable>o <step> <para>Make a private configuration directory:</para> - <screen>&prompt.root; mkdir /var/portbuild/conf/<replaceable>arch</replaceable></screen> + <screen>&prompt.root; mkdir /a/portbuild/conf/<replaceable>arch</replaceable></screen> </step> <step> @@ -2402,20 +2405,20 @@ zfs destroy -r a/snap/src-<replaceable>o <itemizedlist> <listitem> <para>Add <replaceable>arch</replaceable> to <makevar>SUPPORTED_ARCHS</makevar> in - <filename>/var/portbuild/conf/server.conf</filename>.</para> + <filename>/a/portbuild/admin/conf/admin.conf</filename>.</para> </listitem> <listitem> <para>Add the <replaceable>arch</replaceable> directory to - <filename>/var/portbuild/scripts/zbackup</filename> and - <filename>/var/portbuild/scripts/zexpire</filename>.</para> + <filename>/a/portbuild/admin/scripts/zbackup</filename> and + <filename>/a/portbuild/admin/scripts/zexpire</filename>.</para> </listitem> </itemizedlist> <itemizedlist> <listitem> <para>Add an appropriate <replaceable>arch</replaceable> entry for - <filename>/var/portbuild/scripts/dologs</filename> to the portbuild + <filename>/a/portbuild/scripts/dologs</filename> to the portbuild <filename>crontab</filename>. (This is a hack and should go away.)</para> </listitem> </itemizedlist>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302112321.r1BNL9Bu087840>