Move some variable definitions away from control of PORTBUILD_USER and

into control of SRCBUILD_USER, from portbuild/conf/server.conf to
portbuild/admin/conf/admin.conf, respectively.

Implicitly requested by:	rwatson
This commit is contained in:
Mark Linimon 2013-02-11 13:47:43 +00:00
parent 46bc121ee5
commit 6a0104e34c
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=40945

View file

@ -2783,7 +2783,38 @@ sysutils/zfs-stats</programlisting>
<procedure> <procedure>
<step> <step>
<para>(in process of being refactored)</para> <para>Configure the server by making the following changes to
<filename>/<replaceable>a</replaceable>/portbuild/admin/conf/admin.conf</filename>:</para>
<itemizedlist>
<listitem>
<para>For each source branch you will be building for, set
<makevar>SRC_BRANCHES</makevar> and
<makevar>SRC_BRANCH_<replaceable>branch</replaceable>_SUBDIR</makevar>
as detailed in <xref linkend="new-branch-pre-qmanager"/>.
You should not need to change
<makevar>SRC_BRANCHES_PATTERN</makevar>.</para>
</listitem>
<listitem>
<para>Set <makevar>ZFS_VOLUME</makevar> and
<makevar>ZFS_MOUNTPOINT</makevar> to whatever you
chose above.</para>
</listitem>
<listitem>
<para>Set <makevar>VCS_REPOSITORY</makevar> to whatever
you chose above.</para>
</listitem>
<listitem>
<para>Set <makevar>MASTER_URL</makevar> to the http
URL of your server. This will be stamped into the
package build logs and the indices thereof.</para>
</listitem>
</itemizedlist>
<para>Most of the other default values should be fine.</para>
</step> </step>
</procedure> </procedure>
</sect2> </sect2>
@ -2836,6 +2867,7 @@ sysutils/zfs-stats</programlisting>
list of architectures you wish to build packages for.</para> list of architectures you wish to build packages for.</para>
</listitem> </listitem>
<!--
<listitem> <listitem>
<para>For each source branch you will be building for, set <para>For each source branch you will be building for, set
<makevar>SRC_BRANCHES</makevar> and <makevar>SRC_BRANCHES</makevar> and
@ -2850,6 +2882,7 @@ sysutils/zfs-stats</programlisting>
<makevar>ZFS_MOUNTPOINT</makevar> to whatever you <makevar>ZFS_MOUNTPOINT</makevar> to whatever you
chose above.</para> chose above.</para>
</listitem> </listitem>
-->
<listitem> <listitem>
<para>Set <makevar>UPLOAD_DIRECTORY</makevar>, <para>Set <makevar>UPLOAD_DIRECTORY</makevar>,
@ -2858,6 +2891,7 @@ sysutils/zfs-stats</programlisting>
for your site.</para> for your site.</para>
</listitem> </listitem>
<!--
<listitem> <listitem>
<para>Set <makevar>VCS_REPOSITORY</makevar> to whatever <para>Set <makevar>VCS_REPOSITORY</makevar> to whatever
you chose above.</para> you chose above.</para>
@ -2868,6 +2902,7 @@ sysutils/zfs-stats</programlisting>
URL of your server. This will be stamped into the URL of your server. This will be stamped into the
package build logs and the indices thereof.</para> package build logs and the indices thereof.</para>
</listitem> </listitem>
-->
</itemizedlist> </itemizedlist>
<para>Most of the other default values should be fine.</para> <para>Most of the other default values should be fine.</para>