Date: Wed, 29 Mar 2017 20:04:13 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-user@freebsd.org Subject: svn commit: r50100 - user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng Message-ID: <201703292004.v2TK4D5G053342@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Wed Mar 29 20:04:12 2017 New Revision: 50100 URL: https://svnweb.freebsd.org/changeset/doc/50100 Log: - Document the configuration file sourcing for the configuration files. - Add an example of commands to run to build snapshots using the scripts in the 'thermite' directory in svn. - Remove two unused sections. Sponsored by: The FreeBSD Foundation Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-building.xml user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-minor-version.xml Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-building.xml ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-building.xml Wed Mar 29 02:37:25 2017 (r50099) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-building.xml Wed Mar 29 20:04:12 2017 (r50100) @@ -113,6 +113,25 @@ KERNEL="GENERIC64"</programlisting> combination from the list will only be built if the respective configuration file exists, which is where the naming scheme above is relevant.</para> + + <para>There are two paths of file sourcing:</para> + + <itemizedlist> + <listitem> + <para>builds-<replaceable>11</replaceable>.conf -> + main.conf</para> + <para>This controls <filename>thermite.sh</filename> + behavior</para> + </listitem> + + <listitem> + <para><replaceable>11</replaceable>-<replaceable>amd64</replaceable>-<replaceable>GENERIC</replaceable>-<replaceable>snap</replaceable>.conf + -> defaults-<replaceable>11</replaceable>.conf -> + main.conf</para> + <para>This controls <filename>release/release.sh</filename> + behavior within the build &man.chroot.8;</para> + </listitem> + </itemizedlist> </sect3> </sect2> @@ -160,11 +179,32 @@ KERNEL="GENERIC64"</programlisting> then cloned and mounted into the respective build datasets. This is done to avoid checking out a given tree more than once.</para> + + <para>Assuming these filesystem paths, + <filename>thermite.sh</filename> would be invoked as:</para> + + <screen>&prompt.root; <userinput>cd /releng/scripts-snapshot/scripts</userinput> +&prompt.root; <userinput>./setrev.sh -b &branch.stablex;</userinput> +&prompt.root; <userinput>./zfs-setup.sh -c ./builds-<replaceable>11</replaceable>.conf</userinput> +&prompt.root; <userinput>./thermite.sh -c ./builds-<replaceable>11</replaceable>.conf</userinput></screen> </sect2> <sect2 xml:id="releng-build-release"> <title>Building &os; Releases</title> - <para> </para> + <para>Similar to building &os; development snapshots, + <filename>thermite.sh</filename> would be invoked the same way. + The difference between development snapshots and release builds, + <literal>BETA</literal> and <acronym>RC</acronym>, included, is + that the &man.chroot.8; configuration files must be named with + <literal>release</literal> instead of <literal>snap</literal> as + the "type", as mentioned above.</para> + + <para>In addition, the <literal>BUILDTYPE</literal> and + <literal>types</literal> must be changed from + <literal>snap</literal> to <literal>release</literal> in + <filename>defaults-<replaceable>11</replaceable>.conf</filename> + and <filename>builds-<replaceable>11</replaceable>.conf</filename>, + respectively.</para> </sect2> </sect1> Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml Wed Mar 29 02:37:25 2017 (r50099) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-major-version.xml Wed Mar 29 20:04:12 2017 (r50100) @@ -193,10 +193,4 @@ </tgroup> </informaltable> </sect2> - - <sect2 xml:id="releng-head-thaw"> - <title>Code Thaw in &branch.head;</title> - - <para> </para> - </sect2> </sect1> Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-minor-version.xml ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-minor-version.xml Wed Mar 29 02:37:25 2017 (r50099) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/releng-minor-version.xml Wed Mar 29 20:04:12 2017 (r50100) @@ -171,10 +171,4 @@ ^/&branch.stablex; entry in <filename>svnadmin/conf/approvers</filename>.</para> </sect2> - - <sect2 xml:id="releng-release-rc"> - <title>&os; <literal>RC</literal> Builds</title> - - <para> </para> - </sect2> </sect1>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703292004.v2TK4D5G053342>