We switched away from building in chroots to building in jails some time

ago.  Make the document reflect this.
This commit is contained in:
Mark Linimon 2012-11-18 14:58:02 +00:00
parent 1893e957f2
commit a45fbecc65
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=40065

View file

@ -167,7 +167,7 @@
interesting data (ports and src trees, bindist tarballs,
scripts, etc.) to disconnected nodes during the node-setup
phase. Then, the disconnected portbuild directory is
nullfs-mounted for chroot builds.</para>
nullfs-mounted for jail builds.</para>
<para>The
<username>ports-<replaceable>${arch}</replaceable></username>
@ -191,27 +191,27 @@
</sect1>
<sect1 id="setup">
<title>Chroot Build Environment Setup</title>
<title>Jail Build Environment Setup</title>
<para>Package builds are performed in a
<literal>chroot</literal> populated by the
<literal>jail</literal> populated by the
<filename>portbuild</filename> script using the
<filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/builds/<replaceable>${buildid}</replaceable>/bindist.tar</filename>
file.</para>
<para>The following command builds a world from the
<para>The <command>makeworld</command> command builds a world from the
<filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/builds/<replaceable>${buildid}</replaceable>/src/</filename>
tree and installs it into
<replaceable>${worlddir}</replaceable>. The tree will
<filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/builds/<replaceable>${buildid}</replaceable>/bindist.tar</filename>.
The tree will
be updated first unless <literal>-nocvs</literal> is
specified.</para>
specified. It should be run as <username>root</username>:</para>
<screen>/var/portbuild&prompt.root; <userinput>scripts/makeworld <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable> [-nocvs]</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 run as <username>root</username> with the following
command:</para>
script. It should be also be run as <username>root</username>:</para>
<screen>/var/portbuild&prompt.root; <userinput>scripts/mkbindist <replaceable>${arch}</replaceable> <replaceable>${branch}</replaceable> <replaceable>${buildid}</replaceable></userinput></screen>
@ -915,7 +915,7 @@ PKG_BIN=/usr/local/sbin/pkg</screen>
<screen>&prompt.user; <userinput>/var/portbuild/scripts/build cleanup i386 8-exp 20080714120411 -full</userinput></screen></para>
<para>If you forget to do this, then the old build
<literal>chroot</literal>s will not be cleaned up for 24 hours, and no
<literal>jail</literal>s will not be cleaned up for 24 hours, and no
new jobs will be dispatched in their place since
<hostid>pointyhat</hostid> thinks the job slot is still occupied.</para>
@ -1564,9 +1564,13 @@ umount: Cleanup of /x/tmp/8-exp/chroot/53837/compat/linux/proc failed!
<step>
<para>Pick a directory to hold ports configuration and
<command>chroot</command> subdirectories. It may be
<filename>chroot</filename> subdirectories. It may be
best to put it this on its own partition. (Example:
<filename>/usr2/</filename>.)</para>
<note>
<para>The filename <filename>chroot</filename> is a
a historical remnant.</para>
</note>
</step>
</procedure>
@ -2011,7 +2015,7 @@ touch /tmp/.boot_finished</screen>
between boots then they must either preserve their
<filename>/tmp</filename>, or revalidate their available
builds at boot time (see the script on the <literal>amd64</literal>
machines). They must also clean up stale chroots from previous
machines). They must also clean up stale jails from previous
builds before creating <filename>/tmp/.boot_finished</filename>.
</para>
</step>