diff --git a/en_US.ISO8859-1/articles/releng/article.sgml b/en_US.ISO8859-1/articles/releng/article.sgml index c828a55d1d..9baaf0741a 100644 --- a/en_US.ISO8859-1/articles/releng/article.sgml +++ b/en_US.ISO8859-1/articles/releng/article.sgml @@ -52,7 +52,7 @@ This paper describes the approach used by the FreeBSD release engineering team to make production quality releases of the FreeBSD Operating System. It details the methodology - used for the release of FreeBSD 4.4 and describes the tools + used for the official FreeBSD releases and describes the tools available for those interested in producing customized FreeBSD releases for corporate rollouts or commercial productization. @@ -131,8 +131,9 @@ is made. After the release goes out, only the most critical security fixes and additions are merged onto the release branch. In addition to source updates via CVS, binary patchkits are - available to keep systems on the RELENG_4_3 - and RELENG_4_4 branches updated. + available to keep systems on the + RELENG_X_Y + branches updated. discusses the different phases of the release engineering process leading up to @@ -220,12 +221,14 @@ Creating the Release Branch - As described in the introduction, the RELENG_X_Y release - branch is a relatively new addition to our release engineering + As described in the introduction, the + RELENG_X_Y + release branch is a relatively new addition to our release + engineering methodology. The first step in creating this branch is to ensure that you are working with the newest version of the - RELENG_X sources that you want to branch - from. + RELENG_X sources + that you want to branch from. /usr/src&prompt.root; cvs update -rRELENG_4 -P -d @@ -233,15 +236,16 @@ tag, so that diffs against the start of the branch are easier with CVS: - /usr/src&prompt.root; cvs rtag -rRELENG_4 RELENG_4_4_BP src + /usr/src&prompt.root; cvs rtag -rRELENG_4 RELENG_4_8_BP src And then a new branch tag is created with: - /usr/src&prompt.root; cvs rtag -b -rRELENG_4_4_BP RELENG_4_4 src + /usr/src&prompt.root; cvs rtag -b -rRELENG_4_8_BP RELENG_4_8 src - The RELENG_* tags are - restricted for use by the CVS-meisters and release + The + RELENG_* tags + are restricted for use by the CVS-meisters and release engineers. @@ -325,10 +329,6 @@ src/share/examples/cvsup/standard-supfile - - src/share/misc/bsd-family-tree - - src/sys/conf/newvers.sh @@ -341,18 +341,6 @@ src/usr.sbin/pkg_install/add/main.c - - www/en/includes.xsl - - - - www/en/includes.sgml - - - - www/en/releases/* - - www/en/docs.sgml @@ -387,21 +375,44 @@ the number of available ports and the amount of disk space required for the Ports Collection. This information is currently kept in src/release/sysinstall/dist.c. + + After the release has been built, a number of file should + be updated to announce the release to the world. + + + + www/en/includes.xsl + + + + www/en/includes.sgml + + + + www/en/releases/* + + + + src/share/misc/bsd-family-tree + + + + Creating Release Tags When the final release is ready, the following command - will create the RELENG_4_4_0_RELEASE + will create the RELENG_4_8_0_RELEASE tag. - /usr/src&prompt.root; cvs rtag -rRELENG_4_4 RELENG_4_4_0_RELEASE src + /usr/src&prompt.root; cvs rtag -rRELENG_4_8 RELENG_4_8_0_RELEASE src The Documentation and Ports managers are responsible for - tagging the respective trees with the RELEASE_4_4_0 + tagging the respective trees with the RELEASE_4_8_0 tag. Occasionally, a last minute fix may be required @@ -489,13 +500,13 @@ There are many other variables available to customize the release build. Most of these variables are documented at the top of src/release/Makefile. The exact - command used to build the official FreeBSD 4.4 (x86) release + command used to build the official FreeBSD 4.7 (x86) release was: make release CHROOTDIR=/local3/release \ - BUILDNAME=4.4-RELEASE \ + BUILDNAME=4.7-RELEASE \ CVSROOT=/host/cvs/usr/home/ncvs \ - RELEASETAG=RELENG_4_4_0_RELEASE + RELEASETAG=RELENG_4_7_0_RELEASE