From gjb at FreeBSD.org Fri Feb 14 22:31:01 2014 From: gjb at FreeBSD.org (Glen Barber) Date: Fri, 14 Feb 2014 22:31:01 +0000 (UTC) Subject: svn commit: r43934 - user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng Message-ID: <201402142231.s1EMV1DK068963@svn.freebsd.org> Author: gjb Date: Fri Feb 14 22:31:01 2014 New Revision: 43934 URL: http://svnweb.freebsd.org/changeset/doc/43934 Log: Add notes about "blanket approval" requests and work-in-progress extensions that are typical after announcing the schedule for a release cycle. Sponsored by: The FreeBSD Foundation Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:30:59 2014 (r43933) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:01 2014 (r43934) @@ -172,6 +172,30 @@ After general agreement on the schedule, the &team.re; emails the the schedule to the &os; Developers. + + It is somewhat typical that many developers will inform + the &team.re; about various works-in-progress. In some cases, + and extension for the in-progress work will be requested, and + in other cases, a request for blanket approval + to a particular subset of the tree will be made. + + When such requests are made, it is important to make sure + timelines (even if estimated) are discussed. For blanket + approvals, the length of time for the blanket approval should + be made clear. For example, a &os; developer may request + blanket approvals from the start of the code slush until the + start of the -RC builds. + + Depending on the underlying set of code in question, and + the overall impact the set of code has on &os; as a whole, such + requests may be approved or denied by the &team.re;. + + The same applies to work-in-progress extensions. For + example, in-progress work for a new device driver that is + otherwise isolated from the rest of the tree may be granted + an extension. A new scheduler, however, may not be feasible, + expecially if such dramatic changes do not exist in another + branch. From gjb at FreeBSD.org Fri Feb 14 22:31:15 2014 From: gjb at FreeBSD.org (Glen Barber) Date: Fri, 14 Feb 2014 22:31:14 +0000 (UTC) Subject: svn commit: r43941 - user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng Message-ID: <201402142231.s1EMVEdJ069504@svn.freebsd.org> Author: gjb Date: Fri Feb 14 22:31:14 2014 New Revision: 43941 URL: http://svnweb.freebsd.org/changeset/doc/43941 Log: Consolidate the 'code slush' and 'code freeze' into its own section. Sponsored by: The FreeBSD Foundation Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:12 2014 (r43940) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:14 2014 (r43941) @@ -80,6 +80,15 @@ + + + + General information about the code + slush and code freeze. + + + + @@ -217,15 +226,18 @@ branch. - + Release from <literal>head/</literal> - This section describes the general procedures of the - &os; release cycle from the head/ - branch. + This section describes the general procedures related + to the code slush and code freeze + during the &os; release cycle. + + This applies to both head/ and + stable/ branches. - - Code Slush in <literal>head/</literal> + + The Code Slush Approximately one month prior to the scheduled code slush, the &team.re; sends a reminder @@ -239,11 +251,43 @@ branch. - - Code Freeze in <literal>head/</literal> + + The Code Freeze -   + Approximately one week prior to the scheduled + code freeze, the &team.re; sends a reminder + email to the &os; Developers. + + The code freeze marks the point in time where all commits + to the branch require explicit approval from the + &team.re;. + + The &os; Subversion repository + contains several hooks to perform sanity checks before any + commit is actually committed to the tree. One of these hooks + will evaluate if committing to a particular branch requires + specific approval. + + To enforce commit approvals by the &team.re;, the Release + Engineer updates + base/svnadmin/conf/approvers, and commits + the change back to the repository. Once this is done, any + change to the branch must include an Approved + by: line in the commit message. + + The Approved by: line must match the second + column in base/svnadmin/conf/approvers, + otherwise the commit will be rejected by the repository + hooks. + + + + Release from <literal>head/</literal> + + This section describes the general procedures of the + &os; release cycle from the head/ + branch. &os; <quote><literal>ALPHA</literal></quote> @@ -281,36 +325,6 @@ &os; release cycle from an extablished <literal>stable/</literal> branch.</para> - <sect2 xml:id="releng-stable-slush"> - <title>Code Slush in <literal>head/</literal> - - - If the release is being created from - head/, this section can be skipped - because the code slush would have already been in effect. - Instead, continue with . - - -   - - - - Code Freeze in the - <literal>stable/<replaceable>N/</replaceable></literal> - Branch - - - If the release is being created from - head/, this section can be skipped - because the code freeze would have already been in effect. - Instead, continue with . - - -   - - &os; <literal>-BETA</literal> Builds From gjb at FreeBSD.org Fri Feb 14 22:31:24 2014 From: gjb at FreeBSD.org (Glen Barber) Date: Fri, 14 Feb 2014 22:31:24 +0000 (UTC) Subject: svn commit: r43946 - user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng Message-ID: <201402142231.s1EMVOe3069689@svn.freebsd.org> Author: gjb Date: Fri Feb 14 22:31:24 2014 New Revision: 43946 URL: http://svnweb.freebsd.org/changeset/doc/43946 Log: Fix wording in a title. Sponsored by: The FreeBSD Foundation Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:22 2014 (r43945) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:24 2014 (r43946) @@ -418,7 +418,7 @@ Information about <filename>release.sh</filename> and - <filename>release.conf</filename> for Affected + <filename>release.conf</filename> for Specific Architectures   From gjb at FreeBSD.org Fri Feb 14 22:31:13 2014 From: gjb at FreeBSD.org (Glen Barber) Date: Fri, 14 Feb 2014 22:31:12 +0000 (UTC) Subject: svn commit: r43940 - user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng Message-ID: <201402142231.s1EMVCCK069194@svn.freebsd.org> Author: gjb Date: Fri Feb 14 22:31:12 2014 New Revision: 43940 URL: http://svnweb.freebsd.org/changeset/doc/43940 Log: Add content to the 'code slush' section. Sponsored by: The FreeBSD Foundation Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:10 2014 (r43939) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:12 2014 (r43940) @@ -227,7 +227,16 @@ Code Slush in <literal>head/</literal> -   + Approximately one month prior to the scheduled + code slush, the &team.re; sends a reminder + email to the &os; Developers. + + Although the code slush is technically not a hard freeze + on the tree, the &team.re; requests that bugs in the existing + code base take priority over new features. + + The code slush does not enforce commit approvals to the + branch. From gjb at FreeBSD.org Fri Feb 14 22:31:17 2014 From: gjb at FreeBSD.org (Glen Barber) Date: Fri, 14 Feb 2014 22:31:16 +0000 (UTC) Subject: svn commit: r43942 - user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng Message-ID: <201402142231.s1EMVGEm069542@svn.freebsd.org> Author: gjb Date: Fri Feb 14 22:31:16 2014 New Revision: 43942 URL: http://svnweb.freebsd.org/changeset/doc/43942 Log: Fix a section title. Sponsored by: The FreeBSD Foundation Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:14 2014 (r43941) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:16 2014 (r43942) @@ -227,7 +227,7 @@ - Release from <literal>head/</literal> + Freezing the &os; Source Tree This section describes the general procedures related to the code slush and code freeze From gjb at FreeBSD.org Fri Feb 14 22:30:57 2014 From: gjb at FreeBSD.org (Glen Barber) Date: Fri, 14 Feb 2014 22:30:57 +0000 (UTC) Subject: svn commit: r43932 - user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng Message-ID: <201402142230.s1EMUvwO068880@svn.freebsd.org> Author: gjb Date: Fri Feb 14 22:30:57 2014 New Revision: 43932 URL: http://svnweb.freebsd.org/changeset/doc/43932 Log: Add postmaster@ entity. Sponsored by: The FreeBSD Foundation Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 21:23:42 2014 (r43931) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:30:57 2014 (r43932) @@ -7,6 +7,7 @@ + ]>
From gjb at FreeBSD.org Fri Feb 14 22:30:59 2014 From: gjb at FreeBSD.org (Glen Barber) Date: Fri, 14 Feb 2014 22:30:59 +0000 (UTC) Subject: svn commit: r43933 - user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng Message-ID: <201402142230.s1EMUxG5068916@svn.freebsd.org> Author: gjb Date: Fri Feb 14 22:30:59 2014 New Revision: 43933 URL: http://svnweb.freebsd.org/changeset/doc/43933 Log: Sort entities. Sponsored by: The FreeBSD Foundation Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:30:57 2014 (r43932) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:30:59 2014 (r43933) @@ -3,11 +3,11 @@ "http://www.FreeBSD.org/XML/share/xml/freebsd50.dtd" [ - - - + + + ]>
From gjb at FreeBSD.org Fri Feb 14 22:31:06 2014 From: gjb at FreeBSD.org (Glen Barber) Date: Fri, 14 Feb 2014 22:31:05 +0000 (UTC) Subject: svn commit: r43936 - user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng Message-ID: <201402142231.s1EMV5O3069043@svn.freebsd.org> Author: gjb Date: Fri Feb 14 22:31:04 2014 New Revision: 43936 URL: http://svnweb.freebsd.org/changeset/doc/43936 Log: Add content placeholders. This commit really only sets the flow of the upcoming content changes. Sponsored by: The FreeBSD Foundation Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:02 2014 (r43935) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:04 2014 (r43936) @@ -93,6 +93,14 @@ point release. + + + + + + Wrapping up the release cycle. + + @@ -201,14 +209,119 @@ Release from <literal>head/</literal> -   + This section describes the general procedures of the + &os; release cycle from the head/ + branch. + + + Code Slush in <literal>head/</literal> + +   + + + + Code Freeze in <literal>head/</literal> + +   + + + + &os; <quote><literal>ALPHA</literal></quote> + builds +   + + + + Creating the + <literal>stable/<replaceable>N</replaceable></literal> + Branch + +   + + + + Code Thaw in <literal>head/</literal> + +   + Release from <literal>stable/</literal> -   + This section describes the general procedures of the + &os; release cycle from an extablished + stable/ branch. + + + Code Slush in <literal>head/</literal> + + + If the release is being created from + head/, this section can be skipped + because the code slush would have already been in effect. + Instead, continue with . + + +   + + + + Code Freeze in the + <literal>stable/<replaceable>N/</replaceable></literal> + Branch + + + If the release is being created from + head/, this section can be skipped + because the code freeze would have already been in effect. + Instead, continue with . + + +   + + + + &os; <literal>-BETA</literal> Builds + +   + + + + Creating the + <literal>releng/<replaceable>N.M/</replaceable></literal> + Branch + +   + + + + Code Thaw in the + <literal>stable/<replaceable>N/</replaceable></literal> + Branch + +   + + + + &os; <literal>-RC</literal> Builds + +   + + + + The &os; <literal>-RELEASE</literal> Build + +   + + + + + Wrapping up the Release Cycle + This section describes general post-release tasks.
From gjb at FreeBSD.org Fri Feb 14 22:31:20 2014 From: gjb at FreeBSD.org (Glen Barber) Date: Fri, 14 Feb 2014 22:31:20 +0000 (UTC) Subject: svn commit: r43944 - user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng Message-ID: <201402142231.s1EMVKue069617@svn.freebsd.org> Author: gjb Date: Fri Feb 14 22:31:20 2014 New Revision: 43944 URL: http://svnweb.freebsd.org/changeset/doc/43944 Log: Add notes about the -ALPHA build and what file(s) to update. Add placeholder section for "building the images." Sponsored by: The FreeBSD Foundation Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:18 2014 (r43943) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:20 2014 (r43944) @@ -113,6 +113,15 @@ Wrapping up the release cycle. + + + + + + Information related to the specific procedures to + build installation medium. + + @@ -305,6 +314,17 @@ &os; -ALPHA snapshots should be built approximately once a week. + + For the first -ALPHA build, the + BRANCH value in + sys/conf/newvers.sh needs to be changed + from CURRENT to ALPHA1. + For subsequent -ALPHA builds, increment + each ALPHAN + value by one. + + See for information on + building the -ALPHA images. @@ -376,4 +396,11 @@ This section describes general post-release tasks. + + + Building the Installer Images + + This section describes how to build the installation images + as part of the &os; release cycle. +
From gjb at FreeBSD.org Fri Feb 14 22:31:03 2014 From: gjb at FreeBSD.org (Glen Barber) Date: Fri, 14 Feb 2014 22:31:03 +0000 (UTC) Subject: svn commit: r43935 - user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng Message-ID: <201402142231.s1EMV3W5069002@svn.freebsd.org> Author: gjb Date: Fri Feb 14 22:31:02 2014 New Revision: 43935 URL: http://svnweb.freebsd.org/changeset/doc/43935 Log: Clean up indentation. Remove TOC entry. Set FORMATS='html html-split'. Sponsored by: The FreeBSD Foundation Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/Makefile Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/Makefile ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/Makefile Fri Feb 14 22:31:01 2014 (r43934) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/Makefile Fri Feb 14 22:31:02 2014 (r43935) @@ -3,19 +3,18 @@ # # Article: FreeBSD Release Engineering -DOC?= article +DOC?= article -FORMATS?= html -WITH_ARTICLE_TOC?= YES +FORMATS?= html html-split -INSTALL_COMPRESSED?= gz +INSTALL_COMPRESSED?=gz INSTALL_ONLY_COMPRESSED?= SRCS= article.xml -CSS_SHEET_ADDITIONS= extra.css +CSS_SHEET_ADDITIONS=extra.css URL_RELPREFIX?= ../../../.. -DOC_PREFIX?= ${.CURDIR}/../../.. +DOC_PREFIX?= ${.CURDIR}/../../.. .include "${DOC_PREFIX}/share/mk/doc.project.mk" From gjb at FreeBSD.org Fri Feb 14 22:31:18 2014 From: gjb at FreeBSD.org (Glen Barber) Date: Fri, 14 Feb 2014 22:31:18 +0000 (UTC) Subject: svn commit: r43943 - user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng Message-ID: <201402142231.s1EMVI8W069579@svn.freebsd.org> Author: gjb Date: Fri Feb 14 22:31:18 2014 New Revision: 43943 URL: http://svnweb.freebsd.org/changeset/doc/43943 Log: Add notes about -ALPHA builds. Sponsored by: The FreeBSD Foundation Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:16 2014 (r43942) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:18 2014 (r43943) @@ -293,7 +293,18 @@ &os; <quote><literal>ALPHA</literal></quote> Builds -   + Starting with the &os; 10.0-RELEASE cycle, the notion + of -ALPHA builds was + introduced. Unlike the -BETA and + -RC builds, -ALPHA + builds are not included in the &os; Release schedule. + + The idea behind -ALPHA builds is to + provide regular &os;-provided builds before the creation of + the stable/ branch. + + &os; -ALPHA snapshots should be built + approximately once a week. From gjb at FreeBSD.org Fri Feb 14 22:31:26 2014 From: gjb at FreeBSD.org (Glen Barber) Date: Fri, 14 Feb 2014 22:31:26 +0000 (UTC) Subject: svn commit: r43947 - user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng Message-ID: <201402142231.s1EMVQsD069725@svn.freebsd.org> Author: gjb Date: Fri Feb 14 22:31:25 2014 New Revision: 43947 URL: http://svnweb.freebsd.org/changeset/doc/43947 Log: Fix a nit in a title. Sponsored by: The FreeBSD Foundation Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:24 2014 (r43946) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:25 2014 (r43947) @@ -417,7 +417,7 @@ - Information about <filename>release.sh</filename> and + <title>Information About <filename>release.sh</filename> and <filename>release.conf</filename> for Specific Architectures From gjb at FreeBSD.org Fri Feb 14 22:31:07 2014 From: gjb at FreeBSD.org (Glen Barber) Date: Fri, 14 Feb 2014 22:31:07 +0000 (UTC) Subject: svn commit: r43937 - user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng Message-ID: <201402142231.s1EMV7iG069083@svn.freebsd.org> Author: gjb Date: Fri Feb 14 22:31:06 2014 New Revision: 43937 URL: http://svnweb.freebsd.org/changeset/doc/43937 Log: Placeholder for the KBI/KPI freeze. Sponsored by: The FreeBSD Foundation Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:04 2014 (r43936) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:06 2014 (r43937) @@ -232,6 +232,13 @@   + + The <acronym>KBI</acronym>/<acronym>KPI</acronym> + Freeze + +   + + Creating the <literal>stable/<replaceable>N</replaceable></literal> From gjb at FreeBSD.org Fri Feb 14 22:31:11 2014 From: gjb at FreeBSD.org (Glen Barber) Date: Fri, 14 Feb 2014 22:31:10 +0000 (UTC) Subject: svn commit: r43939 - user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng Message-ID: <201402142231.s1EMVAop069157@svn.freebsd.org> Author: gjb Date: Fri Feb 14 22:31:10 2014 New Revision: 43939 URL: http://svnweb.freebsd.org/changeset/doc/43939 Log: Add a note that the KBI freeze date can be excluded if the release will be rolled from an existing stable/ branch. Sponsored by: The FreeBSD Foundation Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:08 2014 (r43938) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:10 2014 (r43939) @@ -181,6 +181,14 @@ </tgroup> </informaltable> + <note> + <para>If the release is being created from an existing + <literal>stable/</literal> branch, the <acronym>KBI</acronym> + freeze date can be excluded, since the <acronym>KBI</acronym> + is already considered frozen on established + <literal>stable/</literal> branches.</para> + </note> + <para>After general agreement on the schedule, the &team.re; emails the schedule to the &os; Developers.</para> From gjb at FreeBSD.org Fri Feb 14 22:31:22 2014 From: gjb at FreeBSD.org (Glen Barber) Date: Fri, 14 Feb 2014 22:31:22 +0000 (UTC) Subject: svn commit: r43945 - user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng Message-ID: <201402142231.s1EMVM2E069656@svn.freebsd.org> Author: gjb Date: Fri Feb 14 22:31:22 2014 New Revision: 43945 URL: http://svnweb.freebsd.org/changeset/doc/43945 Log: Add placeholder entry to cover release.sh, release.conf, and notes specific to architectures that require special tunings. Sponsored by: The FreeBSD Foundation Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:20 2014 (r43944) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:22 2014 (r43945) @@ -402,5 +402,26 @@ <para>This section describes how to build the installation images as part of the &os; release cycle.</para> + + <sect2 xml:id="releng-release-releasesh"> + <title>The <filename>release.sh</filename> Script + +   + + + + The <filename>release.conf</filename> + Configuration + +   + + + + Information about <filename>release.sh</filename> and + <filename>release.conf</filename> for Affected + Architectures + +   + From gjb at FreeBSD.org Fri Feb 14 22:31:09 2014 From: gjb at FreeBSD.org (Glen Barber) Date: Fri, 14 Feb 2014 22:31:09 +0000 (UTC) Subject: svn commit: r43938 - user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng Message-ID: <201402142231.s1EMV9Yl069120@svn.freebsd.org> Author: gjb Date: Fri Feb 14 22:31:08 2014 New Revision: 43938 URL: http://svnweb.freebsd.org/changeset/doc/43938 Log: Whitespace, markup, and spelling fixes. Sponsored by: The FreeBSD Foundation Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:06 2014 (r43937) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:08 2014 (r43938) @@ -9,9 +9,12 @@ ]> -
+
- &os; Release Engineering + + &os; Release Engineering &tm-attrib.freebsd; @@ -42,7 +45,7 @@ branches is three (3) days. Although a general rule to wait a minimum of three days - before mergeing from head/, there are a few + before merging from head/, there are a few special circumstances where an immediate merge may be necessary, such as a critical security fix, or a bug fix that directly inhibits the release build process. @@ -179,7 +182,7 @@ After general agreement on the schedule, the &team.re; - emails the the schedule to the &os; Developers. + emails the schedule to the &os; Developers. It is somewhat typical that many developers will inform the &team.re; about various works-in-progress. In some cases, @@ -227,7 +230,7 @@ &os; <quote><literal>ALPHA</literal></quote> - builds + Builds   From wblock at wonkity.com Sat Feb 15 06:48:41 2014 From: wblock at wonkity.com (Warren Block) Date: Fri, 14 Feb 2014 23:48:38 -0700 (MST) Subject: svn commit: r43934 - user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng In-Reply-To: <201402142231.s1EMV1DK068963@svn.freebsd.org> References: <201402142231.s1EMV1DK068963@svn.freebsd.org> Message-ID: On Fri, 14 Feb 2014, Glen Barber wrote: > Author: gjb > Date: Fri Feb 14 22:31:01 2014 > New Revision: 43934 > URL: http://svnweb.freebsd.org/changeset/doc/43934 > > Log: > Add notes about "blanket approval" requests and work-in-progress > extensions that are typical after announcing the schedule for a > release cycle. > > Sponsored by: The FreeBSD Foundation > > Modified: > user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml > > Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml > ============================================================================== > --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:30:59 2014 (r43933) > +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Fri Feb 14 22:31:01 2014 (r43934) > @@ -172,6 +172,30 @@ > > After general agreement on the schedule, the &team.re; > emails the the schedule to the &os; Developers. > + > + It is somewhat typical that many developers will inform > + the &team.re; about various works-in-progress. In some cases, > + and extension for the in-progress work will be requested, and Typo: s/and extension/an extension/ From gjb at FreeBSD.org Sat Feb 15 14:30:56 2014 From: gjb at FreeBSD.org (Glen Barber) Date: Sat, 15 Feb 2014 14:30:56 +0000 (UTC) Subject: svn commit: r43950 - user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng Message-ID: <201402151430.s1FEUu2W047746@svn.freebsd.org> Author: gjb Date: Sat Feb 15 14:30:55 2014 New Revision: 43950 URL: http://svnweb.freebsd.org/changeset/doc/43950 Log: Typo fix. Submitted by: wblock Sponsored by: The FreeBSD Foundation Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Modified: user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml ============================================================================== --- user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Sat Feb 15 13:22:09 2014 (r43949) +++ user/gjb/releng-rewrite/en_US.ISO8859-1/articles/freebsd-releng/article.xml Sat Feb 15 14:30:55 2014 (r43950) @@ -212,7 +212,7 @@ It is somewhat typical that many developers will inform the &team.re; about various works-in-progress. In some cases, - and extension for the in-progress work will be requested, and + an extension for the in-progress work will be requested, and in other cases, a request for blanket approval to a particular subset of the tree will be made.