Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/BUILDING,v rcsdiff: /ftp/cvs/cvsroot/src/BUILDING,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.113 retrieving revision 1.121 diff -u -p -r1.113 -r1.121 --- src/BUILDING 2014/11/06 06:42:25 1.113 +++ src/BUILDING 2015/07/23 08:03:24 1.121 @@ -77,8 +77,12 @@ FILES any of these directories are missing, they will be skipped during the build. - x11/ ``Reachover'' build structure for X11R6; the source is in - X11SRCDIR. + external/mit/xorg/ + ``Reachover'' build structure for modular Xorg; the source + is in X11SRCDIR. + + extsrc/ ``Reachover'' build structure for externally added + programs and libraries; the source is in EXTSRCSRCDIR. Build tree layout The NetBSD build tree is described in hier(7), and the release layout is @@ -197,6 +201,13 @@ CONFIGURATION Note: build.sh will provide a default of destdir.MACHINE (in the top-level .OBJDIR) unless run in `expert' mode. + EXTSRCSRCDIR + Directory containing sources of externally added programs and + libraries. If specified, must be an absolute path. + + Default: NETBSDRCDIR/../extsrc, if that exists; otherwise + /usr/extsrc. + MAKECONF The name of the make(1) configuration file. Only settable in the process environment. @@ -264,6 +275,11 @@ CONFIGURATION Default: ``yes'' + MKEXTSRC Can be set to ``yes'' or ``no''. Indicates whether extsrc is + built from EXTSRCSRCDIR. + + Default: ``no'' + MKHTML Can be set to ``yes'' or ``no''. Indicates whether preformatted HTML manual pages will be built and installed @@ -427,19 +443,13 @@ CONFIGURATION USETOOLS is also set to ``no'' when using outside the NetBSD source tree. - X11SRCDIR Directory containing the X11R6 source. If specified, must be - an absolute path. The main X11R6 source is found in - X11SRCDIR/xfree/xc. + X11SRCDIR Directory containing the modular Xorg source. If specified, + must be an absolute path. The main modular Xorg source is + found in X11SRCDIR/external/mit. Default: NETBSDRCDIR/../xsrc, if that exists; otherwise /usr/xsrc. - X11FLAVOUR The style of X11 cross-built, set to either ``Xorg'' or - ``XFree86''. - - Default: ``Xorg'' on amd64, i386, macppc, shark and sparc64 - platforms, ``XFree86'' on everything else. - "make" variables for full builds These variables only affect the top level ``Makefile'' and do not affect manually building subtrees of the NetBSD source code. @@ -632,8 +642,8 @@ BUILDING set (see above). iso-image Create a NetBSD installation CD-ROM image in the - RELEASEDIR/iso directory. The CD-ROM file system will have - a layout as described in release(7). + RELEASEDIR/images directory. The CD-ROM file system will + have a layout as described in release(7). For most machine types, the CD-ROM will be bootable, and will automatically run the sysinst(8) menu-based @@ -649,8 +659,8 @@ BUILDING the RELEASEDIR/RELEASEMACHINEDIR/installation/cdrom directory by ``make release''. These smaller images usually contain the same tools as the larger images in - RELEASEDIR/iso, but do not contain additional content such - as the distribution sets. + RELEASEDIR/images, but do not contain additional content + such as the distribution sets. Note that the mac68k port still uses an older method of creating CD-ROM images. This requires the mkisofs(1) @@ -659,8 +669,8 @@ BUILDING iso-image-source Create a NetBSD installation CD-ROM image in the - RELEASEDIR/iso directory. The CD-ROM file system will have - a layout as described in release(7). It will have top + RELEASEDIR/images directory. The CD-ROM file system will + have a layout as described in release(7). It will have top level directories for the machine type and source. For most machine types, the CD-ROM will be bootable, and @@ -678,8 +688,8 @@ BUILDING the RELEASEDIR/RELEASEMACHINEDIR/installation/cdrom directory by ``make release''. These smaller images usually contain the same tools as the larger images in - RELEASEDIR/iso, but do not contain additional content such - as the distribution sets. + RELEASEDIR/images, but do not contain additional content + such as the distribution sets. Note that the mac68k port still uses an older method of creating CD-ROM images. This requires the mkisofs(1) @@ -706,8 +716,7 @@ BUILDING must have been performed with MKUNPRIVED=yes because ``make install-image'' relies on information in DESTDIR/METALOG. - live-image Create NetBSD live images in the - RELEASEDIR/RELEASEMACHINEDIR/installation/liveimage + live-image Create NetBSD live images in the RELEASEDIR/images directory. The live image contains all necessary files to boot NetBSD up to multi-user mode, including all files which should be extracted during installation, NetBSD @@ -1022,6 +1031,13 @@ BUILDING -x Set MKX11=yes. + -Y extsrcdir + Set the value of EXTSRCSRCDIR to extsrcdir. If a relative path + is specified, it will be converted to an absolute path before + being used. + + -y Set MKEXTSRC=yes. + -Z var Unset ("zap") the environment variable var. This is propagated to the nbmake wrapper. @@ -1086,4 +1102,4 @@ CAVEATS files in object directories. Instead, one may have to manually remove the files. Consult the UPDATING file for notices concerning this. -NetBSD August 7, 2014 NetBSD +NetBSD April 7, 2015 NetBSD