Update for builds with a dedicated build user. Eliminate some more

customization variables and refer to mk.conf(5) instead.

input & ok tj

1 files changed, 19 insertions, 28 deletions

diff --git a/share/man/man8/release.8 b/share/man/man8/release.8
index a6f77aeba99..bf3d698d74f 100644
--- a/share/man/man8/release.8
+++ b/share/man/man8/release.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: release.8,v 1.77 2016/10/31 20:45:14 tb Exp $
+.\"	$OpenBSD: release.8,v 1.78 2016/11/19 14:25:15 tb Exp $
 .\"
 .\"	Copyright (c) 2000 Marco S. Hyman
 .\"
@@ -9,7 +9,7 @@
 .\"	LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
 .\"	FOR A PARTICULAR PURPOSE.
 .\"
-.Dd $Mdocdate: October 31 2016 $
+.Dd $Mdocdate: November 19 2016 $
 .Dt RELEASE 8
 .Os
 .Sh NAME
@@ -55,13 +55,13 @@ Commands to be run as a user are preceded by a dollar sign
 .Sq $ .
 Commands that must be run as the superuser are preceded by a hash mark
 .Sq # .
-Privileges will be de-escalated to
-.Ev USER
-or the
-.Va BUILDUSER
-specified in
-.Xr mk.conf 5
+Privileges will be de-escalated to the user
+.Sy build
 whenever possible.
+.Pp
+Most of the defaults can be overridden by setting
+the appropriate variables in
+.Xr mk.conf 5 .
 .Ss 1. Update sources
 A
 .Nm
@@ -93,19 +93,10 @@ To update existing sources to the versions identified by one of the above
 tags, use the commands:
 .Bd -literal -offset indent
 $ cd /usr/src && cvs up -r TAG -Pd
-$ cd XSRCDIR && cvs up -r TAG -Pd
-$ cd PORTSDIR && cvs up -r TAG -Pd
+$ cd /usr/xenocara && cvs up -r TAG -Pd
+$ cd /usr/ports && cvs up -r TAG -Pd
 .Ed
 .Pp
-Here,
-.Va XSRCDIR
-and
-.Va PORTSDIR
-are the path to the X Window System and ports tree sources, typically
-.Pa /usr/xenocara
-and
-.Pa /usr/ports .
-.Pp
 .Sy Warning :
 .Xr cvs 1
 tags are
@@ -140,8 +131,9 @@ and the new kernel to
 Reboot.
 .Ss 3. Build a new system
 The build process will place the object files in a tree under
-.Pa /usr/obj ,
-which is assumed to be empty.
+.Pa /usr/obj .
+This directory should be empty and owned by build:wobj with mode 770.
+.Pp
 Create the tree of obj directories and begin the build:
 .Bd -literal -offset indent
 # cd /usr/src
@@ -174,7 +166,7 @@ To build a release, it is necessary to prepare a filesystem mounted with the
 .Xr mount 8
 option.
 The root of this filesystem must have owner
-.Va BUILDUSER
+.Sy build
 and mode 700.
 On this filesystem, create a
 .Va DESTDIR
@@ -210,18 +202,17 @@ match the contents of the release tarballs:
 .Va Xenocara
 is based on the X.Org modular build system.
 Xenocara sources are supposed to be in
-.Va XSRCDIR
-which defaults to
 .Pa /usr/xenocara .
-This variable should be set in
-.Xr mk.conf 5
-if a non-default value is used.
 The
 .Pa /usr/src
 tree is also needed while building xenocara.
+The object directory
+.Pa /usr/xobj
+should be empty and owned by build:wobj with permissions 770.
+.Pp
 The following steps will build and install everything for the first time.
 .Bd -literal -offset indent
-# cd XSRCDIR
+# cd /usr/xenocara
 # make bootstrap
 # make obj
 # make build