os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add a how-to on creating a new branch with the new codebase. While here,

Browse source 
add some notes about how to delete out-of-support branches.
This commit is contained in:
Mark Linimon 2011-10-27 09:05:07 +00:00
parent 23588dfaa4
commit fea803df3d
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=37875
1 changed files with 74 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
en_US.ISO8859-1/articles/portbuild/article.sgml
View file

@ -2088,30 +2088,64 @@ ssh_cmd="/usr/local/bin/ssh"
<itemizedlist>
<listitem>
<para>Create a new <application>zfs</application> filesystem
<para>(new codebase) Edit <filename>/var/portbuild/conf/server.conf</filename>
with the following changes:</para>
<itemizedlist>
<listitem>
<para>Add <replaceable>new-branch</replaceable> to
<makevar>SRC_BRANCHES</makevar>.</para>
</listitem>
<listitem>
<para>For what was previously head, change
<makevar>SRC_BRANCH_<replaceable>branch</replaceable>_TAG</makevar> to
<literal>RELENG_<replaceable>branch</replaceable>_0</literal>.</para>
</listitem>
<listitem>
<para>Add
<makevar>SRC_BRANCH_<replaceable>new-branch</replaceable>_TAG</makevar>
<literal>=.</literal>.</para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>(new codebase) Run <command>
/var/portbuild/updatesnap</command> manually.</para>
</listitem>
<listitem>
<para>(Only for old codebase)
Create a new <application>zfs</application> filesystem
for sources:
<screen>zfs create a/snap/src-<replaceable>branch</replaceable></screen>
</para>
</listitem>
<listitem>
<para>Checkout a <literal>src</literal> tree in the new filesystem:
<para>(Only necessary for old codebase):
Checkout a <literal>src</literal> tree in the new filesystem:
<screen>cvs -Rq -d /r/ncvs co -d src-<replaceable>branch</replaceable>-r RELENG_<replaceable>branch</replaceable></screen>
</para>
</listitem>
<listitem>
<para>Edit the master copy of
<para>(Only necessary for old codebase):
Edit the master copy of
<filename>Tools/portbuild/portbuild.conf</filename>.</para>
</listitem>
<listitem>
<para>For each arch, edit its copy of the above in
<para>(Only necessary for old codebase):
For each arch, edit its copy of the above in
<filename>/var/portbuild/<replaceable>arch</replaceable>/portbuild.conf</filename>.</para>
</listitem>
<listitem>
<para>Edit <filename>/var/portbuild/scripts/buildenv</filename>.</para>
<para>(Only necessary for old codebase):
Edit <filename>/var/portbuild/scripts/buildenv</filename>.</para>
</listitem>
<listitem>
@ -2122,7 +2156,8 @@ ssh_cmd="/usr/local/bin/ssh"
</listitem>
<listitem>
<para>Modify <makevar>HEAD_BRANCH</makevar> and
<para>(Only necessary for old codebase):
Modify <makevar>HEAD_BRANCH</makevar> and
<makevar>NON_HEAD_BRANCHES</makevar> in
<filename>/var/portbuild/scripts/updatesnap</filename>.</para>
</listitem>
@ -2159,6 +2194,39 @@ ln -s ../<replaceable>arch</replaceable>/<replaceable>branch</replaceable>/build
</itemizedlist>
</sect1>
<sect1 id="old-branch">
<title>How to delete an unsupported &os; branch</title>
<para>When an old branch goes out of support, there are some
things to garbage-collect.</para>
<itemizedlist>
<listitem>
<para>(new codebase) Edit <filename>/var/portbuild/conf/server.conf</filename>
with the following changes:</para>
<itemizedlist>
<listitem>
<para>Delete <replaceable>new-branch</replaceable> from
<makevar>SRC_BRANCHES</makevar>.</para>
</listitem>
<listitem>
<para>Delete
<makevar>SRC_BRANCH_<replaceable>old-branch</replaceable>_TAG</makevar>
<literal>=<replaceable>whatever</replaceable></literal></para>
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>(both):
<command>umount a/snap/src-<replaceable>old-branch</replaceable>/src;
umount a/snap/src-<replaceable>old-branch</replaceable>;
zfs destroy -r a/snap/src-<replaceable>old-branch</replaceable></command></para>
</listitem>
</itemizedlist>
</sect1>
<sect1 id="new-arch">
<title>How to configure a new architecture</title>