From 60e7530a136bfb3758233ad01be7a5d1d8aa3e2b Mon Sep 17 00:00:00 2001 From: Mark Linimon Date: Sun, 18 Jun 2006 20:46:19 +0000 Subject: [PATCH] Note that 6-exp is added as the default "experimental" ports build branch, replacing 5-exp. 4-exp has been deleted. While here, fix some other minor errors. More changes will be forthcoming in the next few days. --- .../articles/portbuild/article.sgml | 54 ++++++++++--------- 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/en_US.ISO8859-1/articles/portbuild/article.sgml b/en_US.ISO8859-1/articles/portbuild/article.sgml index 592383a23f..f691c897b2 100644 --- a/en_US.ISO8859-1/articles/portbuild/article.sgml +++ b/en_US.ISO8859-1/articles/portbuild/article.sgml @@ -47,7 +47,7 @@ be used to specify one of the package architectures (&i386;, alpha, &sparc64;, ia64, and amd64), and ${branch} will be used - to specify the build branch (4, 4-exp, 5, 5-exp, 6, 7). + to specify the build branch (4, 5, 5-exp, 6, 6-exp, 7). @@ -153,13 +153,6 @@ - - dopackages.4-exp - Perform - a 4.X build with experimental patches - (4-exp branch) - - - dopackages.5 - Perform a 5.X build @@ -179,6 +172,13 @@ + + dopackages.6-exp - Perform + a 6.X build with experimental patches + (6-exp branch) + + + dopackages.7 - Perform a 7.X build @@ -193,7 +193,7 @@ dopackages.wrapper. These scripts take a number of arguments. For example: - dopackages.5 ${arch} [-options] + dopackages.6 ${arch} [-options] [-options] may be zero or more of the following: @@ -346,7 +346,7 @@ Be careful that ports/Makefile does not specify any empty subdirectories. This is especially - important if you are doing a 4-exp build. If the build + important if you are doing an -exp build. If the build process encounters an empty subdirectory, both package build phases will stop short, and an error similar to the following will be written to @@ -361,6 +361,12 @@ by running the proper dopackages command with the -restart option. + + + This problem also appears if you create a new category + Makefile with no SUBDIRs + in it. This is probably a bug. + @@ -372,13 +378,13 @@ - A CVS checkout of the current ports + A CVS update of the current ports tree [*] - A CVS checkout of the running branch's + A CVS update of the running branch's src tree [*] @@ -624,7 +630,7 @@ new features or bugfixes to the ports infrastructure (i.e. bsd.port.mk), or to test large sweeping upgrades. The current experimental patches branch is - 5-exp on the &i386; + 6-exp on the &i386; architecture. In general, an experimental patches build is run the same @@ -638,7 +644,7 @@ In order to have a good control case with which to compare failures, you should first do a package build of the branch on which the experimental patches branch is based for the &i386; - architecture (currently this is 5). Then, when + architecture (currently this is 6). Then, when preparing for the experimental patches build, checkout a ports tree and a src tree with the same date as was used for the control build. This will ensure an apples-to-apples comparison @@ -650,21 +656,21 @@ Once the build finishes, compare the control build failures to those of the experimental patches build. Use the following - commands to facilitate this (this assumes the 5 - branch is the control branch, and the 5-exp + commands to facilitate this (this assumes the 6 + branch is the control branch, and the 6-exp branch is the experimental patches branch): - &prompt.user; cd /var/portbuild/i386/5-exp/errors -&prompt.user; find . -name \*.log\* | sort > /tmp/5-exp-errs -&prompt.user; cd /var/portbuild/i386/5/errors -&prompt.user; find . -name \*.log\* | sort > /tmp/5-errs + &prompt.user; cd /var/portbuild/i386/6-exp/errors +&prompt.user; find . -name \*.log\* | sort > /tmp/6-exp-errs +&prompt.user; cd /var/portbuild/i386/6/errors +&prompt.user; find . -name \*.log\* | sort > /tmp/6-errs If it has been a long time since one of the builds finished, the logs may have been automatically compressed with bzip2. In that case, you must use sort | sed 's,\.bz2,,g' instead. - &prompt.user; comm -3 /tmp/5-errs /tmp/5-exp-errs | less + &prompt.user; comm -3 /tmp/6-errs /tmp/6-exp-errs | less This last command will produce a two-column report. The first column is ports that failed on the control build but not in @@ -719,7 +725,7 @@ To differentiate between [1] and [2] above, you can do a rebuild of the affected packages under the control branch: - &prompt.user; cd /var/portbuild/i386/5/ports + &prompt.user; cd /var/portbuild/i386/6/ports Be sure to cvs update this tree to the same date as the experimental patches tree. @@ -727,14 +733,14 @@ The following command will set up the control branch for the partial build: - &prompt.user; /var/portbuild/scripts/dopackages.5 -noportscvs -nobuild -nocvs -nofinish + &prompt.user; /var/portbuild/scripts/dopackages.6 -noportscvs -nobuild -nocvs -nofinish The builds must be performed from the packages/All directory. This directory should initially be empty except for the Makefile symlink. If this symlink does not exist, it must be created: - &prompt.user; cd /var/portbuild/i386/5/packages/All + &prompt.user; cd /var/portbuild/i386/6/packages/All &prompt.user; ln -sf ../../Makefile . &prompt.user; make -k -j<#> <list of packages to build>