Glen Barber <g...@freebsd.org> wrote in <201308111857.r7bivrsq080...@svn.freebsd.org>:
gj> +.It Va SVNROOT gj> +The gj> +.Xr svn 1 gj> +host used to check out the various trees. gj> Defaults to gj> -.Pa svn://svn.freebsd.org . gj> -.It Ev SVNROOTSRC gj> -The URL of the FreeBSD SVN source repository. gj> +.Pa svn://svn.FreeeBSD.org . gj> +.It Va SRCBRANCH gj> +The gj> +.Li src/ gj> +branch to use. gj> Defaults to gj> -.Pa ${SVNROOTBASE}/base . gj> -.It Ev SVNROOTDOC gj> -The URL of the FreeBSD SVN doc repository. gj> +.Va head/ . gj> +.It Va DOCBRANCH gj> +The gj> +.Li doc/ gj> +branch to use. gj> Defaults to gj> -.Pa ${SVNROOTBASE}/doc . gj> -.It Ev SVNROOTPORTS gj> -The URL of the FreeBSD SVN ports repository. gj> +.Va head/ . gj> +.It Va PORTBRANCH gj> +The gj> +.Li ports/ gj> +branch to use. gj> Defaults to gj> -.Pa ${SVNROOTBASE}/ports . gj> -.It Ev BRANCHDOC gj> -The branch name of the FreeBSD SVN doc repository. gj> +.Va head/ . gj> +.It Va SRCREVISION gj> +The revision of the gj> +.Li src/ gj> +tree to use. gj> +Defaults to the current top of tree revision. gj> +.It Va DOCREVISION gj> +The revision of the gj> +.Li doc/ gj> +tree to use. gj> +Defaults to the current top of tree revision. gj> +.It Va PORTREVISION Why separation between revision and branch is needed? I intentionally dropped this part from your old patch to generate-release.sh because branch and revision number can be specified like releng/9.2@NNN in a single variable. An incorrect configuration of the two variables do not always cause a fatal error, so specification in fewer number of variables is more foolproof. gj> +.It Va TARGET gj> +The target machine type for the release. gj> +Defaults to the current machine type. gj> +.It Va TARGET_ARCH gj> +The target machine architecture for the release. gj> +Defaults to the value of gj> +.Va TARGET . gj> +.Pp Please remove default configuration of these variables from release.sh. The reasonable defaults are already set in src/Makefile and setting TARGET_ARCH=$TARGET by default is simply wrong. Also, get_rev_branch() is redundant. gj> +Defaults to setting the number of gj> +.Xr make 1 gj> +jobs gj> +.Pq Ar -j gj> +to half the number of CPUs available on the system. Did you try this on a uniprocessor machine? -- Hiroki
pgpvCkEsWz5jY.pgp
Description: PGP signature