Disambiguate the meaning of "build" in the upload instructions.

This commit is contained in:
Mark Linimon 2007-07-23 09:13:13 +00:00
parent d752d41098
commit 1e058299f1
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=30519

View file

@ -809,24 +809,60 @@ umount: Cleanup of /x/tmp/6-exp/chroot/53837/compat/linux/proc failed!
<command>cdrom.sh</command> before preparing <command>cdrom.sh</command> before preparing
the final package set for a release.</para> the final package set for a release.</para>
<para>The package subdirectories are named by whether they are for
<literal>release</literal>, <literal>stable</literal>, or
<literal>current</literal>. Examples:</para>
<itemizedlist>
<listitem>
<para><literal>packages-6.1-release</literal></para>
</listitem>
<listitem>
<para><literal>packages-6.2-release</literal></para>
</listitem>
<listitem>
<para><literal>packages-6-stable</literal></para>
</listitem>
<listitem>
<para><literal>packages-7-current</literal></para>
</listitem>
</itemizedlist>
<note><para>Some of the directories on
<hostid>ftp-master</hostid> are, in fact, symlinks. Examples:</para>
<itemizedlist>
<listitem>
<para><literal>packages-stable</literal></para>
</listitem>
<listitem>
<para><literal>packages-current</literal></para>
</listitem>
</itemizedlist>
<para> Be sure
you move the new packages directory over the
<emphasis>real</emphasis> destination directory, and not
one of the symlinks that points to it.</para>
</note>
<para>If you are doing a completely new package set (e.g. for <para>If you are doing a completely new package set (e.g. for
a new release), copy packages to the staging area on a new release), copy packages to the staging area on
<hostid>ftp-master</hostid> with something like the following:</para> <hostid>ftp-master</hostid> with something like the following:</para>
<screen>&prompt.root; <userinput>cd /var/portbuild/<replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable></userinput> <screen>&prompt.root; <userinput>cd /var/portbuild/<replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable></userinput>
&prompt.root; <userinput>tar cfv - packages/ | ssh portmgr@ftp-master tar xfC - w/ports/<replaceable>${arch}</replaceable>/tmp/<replaceable>${branch}</replaceable></userinput></screen> &prompt.root; <userinput>tar cfv - packages/ | ssh portmgr@ftp-master tar xfC - w/ports/<replaceable>${arch}</replaceable>/tmp/<replaceable>${subdir}</replaceable></userinput></screen>
<para>Then log into <hostid>ftp-master</hostid>, verify that <para>Then log into <hostid>ftp-master</hostid>, verify that
the package set was transferred successfully, remove the the package set was transferred successfully, remove the
package set that the new package set is to replace (in package set that the new package set is to replace (in
<filename>~/w/ports/<replaceable>${arch}</replaceable></filename>), <filename>~/w/ports/<replaceable>${arch}</replaceable></filename>),
and move the new set into place.</para> and move the new set into place. (<literal>w/</literal> is
merely a shortcut.)</para>
<note><para>Some of the directories on
<hostid>ftp-master</hostid> are, in fact, symlinks. Be sure
you move the new packages directory over the
<emphasis>real</emphasis> destination directory, and not
one of the symlinks that points to it.</para></note>
<para>For incremental builds, packages should be uploaded <para>For incremental builds, packages should be uploaded
using <command>rsync</command> so we do not put too much using <command>rsync</command> so we do not put too much
@ -839,9 +875,10 @@ umount: Cleanup of /x/tmp/6-exp/chroot/53837/compat/linux/proc failed!
option. option.
</para> </para>
<para>Example command for incremental package upload:</para> <para>Example <command>rsync</command> command for incremental
package upload:</para>
<screen>&prompt.root; <userinput>rsync -n -r -v -l -t -p --delete packages/ portmgr@ftp-master:w/ports/<replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/ | tee log</userinput></screen> <screen>&prompt.root; <userinput>rsync -n -r -v -l -t -p --delete packages/ portmgr@ftp-master:w/ports/<replaceable>${arch}</replaceable>/<replaceable>${subdir}</replaceable>/ | tee log</userinput></screen>
<para>Distfiles can also be transferred via <para>Distfiles can also be transferred via
<command>rsync</command>:</para> <command>rsync</command>:</para>