Re: CVS commit: src/share/man/man5
On 23-06-11 15:38, Valery Ushakov wrote: | On Sun, Jun 11, 2023 at 22:19:42 +1000, Luke Mewburn wrote: | > My goal is to get the mk.conf(5) up to date and correct, and more usable. | > I intend to remove the duplication in BUILDING and bsd.README | > and refer back to mk.conf(5) to avoid the copypasta, with some updated | > boilerplate in BUILDING to describe how to find the referenced manual pages | > within BUILDING if you're not on an NetBSD system. | | That would be very nice, thanks. I've made some more improvements to mk.conf(5). I've now removed all the variables in BUILDING that are in mk.conf(5) and added more cross references to mk.conf(5) from BUILDING, including instructions how to find the source for the manual page (because you might be on a non NetBSD-current host) and where the manual pages are online. Next stop, cleaning up share/mk/bsd.README ...
CVS commit: src
Module Name:src Committed By: lukem Date: Sun Jun 11 20:34:14 UTC 2023 Modified Files: src: BUILDING src/doc: BUILDING.mdoc Log Message: BUILDING: remove duplication from mk.conf(5) Remove all "make" variables / mk.conf(5) variables already documented in mk.conf(5). The duplication was a maintenance headache, as I've experienced over recent weeks getting the build documentation up to date. Add notes clarifying that manual page references are to the NetBSD manual pages, not to the host manual pages, and how to format from source, or find online at https://man.netbsd.org. Add explicit links to the mdoc(7) in-tree source for mk.conf(5), hier(7), and release(7) because those are directly relevant to the host build information in BUILDING. Note: We don't normally need these notes for native documentation, but BUILDING is intended for users on host systems which might not be NetBSD(-current). Add missing defaults. To generate a diff of this commit: cvs rdiff -u -r1.154 -r1.155 src/BUILDING cvs rdiff -u -r1.143 -r1.144 src/doc/BUILDING.mdoc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/BUILDING diff -u src/BUILDING:1.154 src/BUILDING:1.155 --- src/BUILDING:1.154 Sun Jun 11 10:49:43 2023 +++ src/BUILDING Sun Jun 11 20:34:14 2023 @@ -16,6 +16,13 @@ REQUIREMENTS the NetBSD build process. (See the Environment variables section below if you need to override or manually select your compilers.) + Note: Within this document, cross-references to manual pages are to the + NetBSD manual pages, not the host system manual pages. The mdoc(7) + source to the NetBSD manual pages can be found within the source tree, + and these and can be formatted with mandoc(1) or nroff(1) if those are + available on the host system. The NetBSD manual pages are also available + at https://man.netbsd.org + FILES Source tree layout BUILDING This document (in plaintext). Generated from @@ -51,8 +58,8 @@ FILES destination system, boot media, and release notes. doc/BUILDING.mdoc -This document, in -mdoc troff format; the original copy. -Used to generate BUILDING. +The source to this document, in mdoc(7) format. Used to +generate BUILDING. external, sys/external Sources and build infrastructure for components imported @@ -86,8 +93,9 @@ FILES during the build. Build tree layout - The NetBSD build tree is described in hier(7), and the release layout is - described in release(7). + The NetBSD build tree is described in hier(7) (mdoc(7) source in + share/man/man7/hier.7), and the release layout is described in release(7) + (mdoc(7) source in share/man/man7/release.7). CONFIGURATION Environment variables @@ -95,12 +103,24 @@ CONFIGURATION HOST_CC Path name to C compiler used to create the toolchain. + Default: "cc". + HOST_CFLAGS Flags passed to the host C compiler. + Default: "-O". + + HOST_CPPFLAGS Flags passed to the host C/C++ pre-processor. + + Default: Unset. + HOST_CXXPath name to C++ compiler used to create the toolchain. + Default: Unset, but defaults to "c++" where required. + HOST_CXXFLAGS Flags passed to the host C++ compiler. + Default: Unset. + HOST_SH Path name to a shell available on the host system and suitable for use during the build. The NetBSD build system requires a modern Bourne-like shell with POSIX- @@ -119,22 +139,32 @@ CONFIGURATION name, which will be converted to an absolute path by searching the PATH. + Default: "sh". + INSTALLBOOT_UBOOT_PATHS A colon-separated list of search paths used by installboot(8) to find U-Boot packages. + Default: Unset. + MACHINE Machine type, e.g., "macppc". + Default: Unset. + MACHINE_ARCHMachine architecture, e.g., "powerpc". + Default: Unset. + MAKEPath name to invoke make(1) as. + Default: "make". + MAKECONFThe name of the make(1) configuration file. See "make" variables and mk.conf(5). Note: Only settable in the process environment. - Default: "/etc/mk.conf" + Default: "/etc/mk.conf". MAKEFLAGS Flags to invoke make(1) with. @@ -142,6 +172,9 @@ CONFIGURATION the environment, but allows MAKEFLAGS to be set via the
CVS commit: src
Module Name:src Committed By: lukem Date: Sun Jun 11 20:34:14 UTC 2023 Modified Files: src: BUILDING src/doc: BUILDING.mdoc Log Message: BUILDING: remove duplication from mk.conf(5) Remove all "make" variables / mk.conf(5) variables already documented in mk.conf(5). The duplication was a maintenance headache, as I've experienced over recent weeks getting the build documentation up to date. Add notes clarifying that manual page references are to the NetBSD manual pages, not to the host manual pages, and how to format from source, or find online at https://man.netbsd.org. Add explicit links to the mdoc(7) in-tree source for mk.conf(5), hier(7), and release(7) because those are directly relevant to the host build information in BUILDING. Note: We don't normally need these notes for native documentation, but BUILDING is intended for users on host systems which might not be NetBSD(-current). Add missing defaults. To generate a diff of this commit: cvs rdiff -u -r1.154 -r1.155 src/BUILDING cvs rdiff -u -r1.143 -r1.144 src/doc/BUILDING.mdoc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man5
Module Name:src Committed By: lukem Date: Sun Jun 11 20:33:46 UTC 2023 Modified Files: src/share/man/man5: mk.conf.5 Log Message: mk.conf(5): more variables from BUILDING and build.sh Add more variables from build.sh, BUILDING, and various Makefile's documentation: CDEXTRA CONFIGOPTS KERNARCHDIR KERNCONFDIR KERNOBJDIR KERNSRCDIR LOCALTIME Default sentences now consistently end with ".". Consistency tweaks in "otherwise". Editorial tweaks. To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/share/man/man5/mk.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man5/mk.conf.5 diff -u src/share/man/man5/mk.conf.5:1.102 src/share/man/man5/mk.conf.5:1.103 --- src/share/man/man5/mk.conf.5:1.102 Sun Jun 11 10:44:33 2023 +++ src/share/man/man5/mk.conf.5 Sun Jun 11 20:33:46 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: mk.conf.5,v 1.102 2023/06/11 10:44:33 lukem Exp $ +.\" $NetBSD: mk.conf.5,v 1.103 2023/06/11 20:33:46 lukem Exp $ .\" .\" Copyright (c) 1999-2023 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -62,7 +62,7 @@ and the default value of each variable. .. .de DFLTn .DFLT -.Dq no +.Dq no . .. .de DFLTu .DFLT @@ -70,7 +70,7 @@ Unset. .. .de DFLTy .DFLT -.Dq yes +.Dq yes . .. .de NODEF .Pp @@ -107,7 +107,7 @@ The real path to the object directory tr .Nx source tree. .DFLT -.Dq Pa /usr/obj +.Dq Pa /usr/obj . . .It Sy BSDSRCDIR The real path to the @@ -116,14 +116,18 @@ source tree, if .Sy NETBSDSRCDIR isn't defined. .DFLT -.Dq Pa /usr/src +.Dq Pa /usr/src . . .It Sy BUILD If defined, .Sq "make install" -checks that the targets in the source directories are up-to-date and +checks that the +.Xr make 1 +targets in the source directories are up-to-date and re-makes them if they are out of date, instead of blindly trying to install -out of date or non-existent targets. +out of date or non-existent +.Xr make 1 +targets. .DFLTu . .It Sy BUILDID @@ -177,6 +181,33 @@ documentation of .Fl frandom-seed . .DFLTu . +.It Sy CDEXTRA +A space-separated list of files or directories that will be +added to the CD-ROM image that may be create by the +.Sy build.sh +.Dq iso-image +or +.Dq iso-image-source +operations. +Files will be added to the root of the CD-ROM image, +whereas directories will be copied recursively. +If relative paths are specified, they will be converted to +absolute paths before being used. +.Em Note : +If using +.Sy build.sh , +multiple paths may be specified via multiple +.Fl C +options, or via a single option whose argument contains multiple +space-separated paths. +.DFLTu +. +.It Sy CONFIGOPTS +Additional flags to +.Xr config 1 +when building kernels. +.DFLTu +. .It Sy COPTS Extra options for the C compiler. Should be appended to (e.g., @@ -234,11 +265,13 @@ will provide a default of .Sy .OBJDIR ) unless run in .Sq expert -mode. +mode with the +.Fl E +option. .DFLT Empty string if .Sy USETOOLS=yes ; -unset otherwise. +otherwise unset. . .It Sy EXTERNAL_TOOLCHAIN If defined, this variable indicates the root directory of @@ -283,12 +316,25 @@ option of .DFLTu . .It Sy INSTALLWORLDDIR -Location for the top-level -.Dq make installworld +Directory for the top-level +.Xr make 1 +.Dq installworld target to install to. If specified, must be an absolute path. .DFLT -.Dq / +.Dq Pa / . +. +.It Sy KERNARCHDIR +Directory under +.Sy KERNSRCDIR +containing the machine dependent kernel sources. +.DFLT +.Dq Pa arch/ Ns Sy MACHINE . +. +.It Sy KERNCONFDIR +Directory containing the kernel configuration files. +.DFLT +.Dq Sy KERNSRCDIR Ns Pa / Ns Sy KERNARCHDIR Ns Pa /conf . . .It Sy KERNEL_DIR Pq No experimental .YorN @@ -321,6 +367,38 @@ The option is a work-in-progress, and is highly experimental. It is also subject to change without notice. .DFLTn +. +.It Sy KERNOBJDIR +Directory for kernel builds. +For example, the kernel +.Sy GENERIC +will be compiled in +.Sy KERNOBJDIR Ns Pa /GENERIC . +.DFLT +.Dq Sy MAKEOBJDIRPREFIX Ns Pa / Ns Sy KERNSRCDIR Ns Pa / Ns Sy KERNARCHDIR Ns Pa /compile +if it exists or the +.Xr make 1 +.Dq obj +target is being made; +otherwise +.Dq Sy KERNSRCDIR Ns Pa / Ns Sy KERNARCHDIR Ns Pa /compile . +. +.It Sy KERNSRCDIR +Directory at the top of the kernel source. +.DFLT +.Dq Sy NETBSDSRCDIR Ns Pa /sys . +. +.It Sy LOCALTIME +The name of the +.Xr tzfile 5 +timezone file in the directory +.Pa /usr/share/zoneinfo +to symbolically link +.Sy DESTDIR Ns Pa /etc/localtime +to. +.DFLT +.Dq UTC . +. .It Sy MAKEVERBOSE Level of verbosity of status messages. Supported values: @@ -356,7 +434,7 @@ are traced through use of the flag. .El .DFLT -2 +.Sy 2 . . .It Sy MKAMDGPUFIRMWARE .YorN @@ -365,7 +443,8 @@ Indicates whether to install the directory, which is necessary for the .Xr amdgpu 4 AMD RADEON GPU video driver. -.DFLTy +.DFLT +.Dq yes on .Sy i386 and @@ -505,7 +584,8 @@
CVS commit: src/share/man/man5
Module Name:src Committed By: lukem Date: Sun Jun 11 20:33:46 UTC 2023 Modified Files: src/share/man/man5: mk.conf.5 Log Message: mk.conf(5): more variables from BUILDING and build.sh Add more variables from build.sh, BUILDING, and various Makefile's documentation: CDEXTRA CONFIGOPTS KERNARCHDIR KERNCONFDIR KERNOBJDIR KERNSRCDIR LOCALTIME Default sentences now consistently end with ".". Consistency tweaks in "otherwise". Editorial tweaks. To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/share/man/man5/mk.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src Committed By: dholland Date: Sun Jun 11 17:54:18 UTC 2023 Modified Files: src/share/misc: acronyms.comp Log Message: +DPAA To generate a diff of this commit: cvs rdiff -u -r1.353 -r1.354 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src Committed By: dholland Date: Sun Jun 11 17:54:18 UTC 2023 Modified Files: src/share/misc: acronyms.comp Log Message: +DPAA To generate a diff of this commit: cvs rdiff -u -r1.353 -r1.354 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.353 src/share/misc/acronyms.comp:1.354 --- src/share/misc/acronyms.comp:1.353 Fri May 26 03:30:57 2023 +++ src/share/misc/acronyms.comp Sun Jun 11 17:54:18 2023 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.353 2023/05/26 03:30:57 jschauma Exp $ +$NetBSD: acronyms.comp,v 1.354 2023/06/11 17:54:18 dholland Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -442,6 +442,7 @@ DOM document object model DOS denial of service DOS disk operating system DP DisplayPort +DPAA data path acceleration architecture DPC deferred procedure call DPCM differential pulse code modulation DPD dead peer detection
CVS commit: src/lib/libm/man
Module Name:src Committed By: christos Date: Sun Jun 11 15:28:21 UTC 2023 Modified Files: src/lib/libm/man: sincos.3 Log Message: Correct history (Brad Smith) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libm/man/sincos.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libm/man/sincos.3 diff -u src/lib/libm/man/sincos.3:1.1 src/lib/libm/man/sincos.3:1.2 --- src/lib/libm/man/sincos.3:1.1 Sat Aug 27 04:31:59 2022 +++ src/lib/libm/man/sincos.3 Sun Jun 11 11:28:21 2023 @@ -22,9 +22,9 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: head/lib/msun/man/sincos.3 366583 2020-10-09 19:12:44Z gbe $ -.\" $NetBSD: sincos.3,v 1.1 2022/08/27 08:31:59 christos Exp $ +.\" $NetBSD: sincos.3,v 1.2 2023/06/11 15:28:21 christos Exp $ .\" -.Dd March 12, 2011 +.Dd June 11, 2023 .Dt SINCOS 3 .Os .Sh NAME @@ -77,7 +77,7 @@ are assigned the values of sine and cosi .Xr sin 3 , .Sh HISTORY These functions were added to -.Fx 9.0 +.Fx 11.2 and .Nx 10.0 to aid in writing various complex function contained in
CVS commit: src/lib/libm/man
Module Name:src Committed By: christos Date: Sun Jun 11 15:28:21 UTC 2023 Modified Files: src/lib/libm/man: sincos.3 Log Message: Correct history (Brad Smith) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libm/man/sincos.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/etc/rc.d
On Sun, Jun 11, 2023 at 11:23:23AM +0300, Kimmo Suominen wrote: > My thinking here is that it makes it simpler to keep the script in > sync between branches. (I have not checked, but I guess the sysctl > does not depend on kernel configuration then.) In this special case I think this would not be a good idea as the entropy changes between current and 10 vs. -9 are fundamental and heavily disputed. Keeping things minimal, clean and consistent is IMO preferable here. Martin
Re: CVS commit: src/share/man/man5
On Sun, Jun 11, 2023 at 22:19:42 +1000, Luke Mewburn wrote: > | I'm not sure what do you mean. The difference between .Ss and .Sh is > | only the indent: > > Ahh, you're right, I misspoke. Tired brain when working on the commit. > > IMHO, they both suffer from lack of blank line there, where personally I > would prefer the blank line, especially before a list, and especially > for .Ss because its indent is only 2 in from the main paragraph. But I'm > not considering an mdoc change for that any time soon. [...] > For me, having a para before it and the outdented heading makes the BSDOBJDIR > "pop" more in a quick eyeball scan, plus easier section searching. > > YMMV. I guess my own preference is half-way, with .Ss, but with the extra text you added to prevent the .Bl from blending in with the heading. .Sh ALL CAPS HEADING pokes out to the left margin and has a bit too much visual gravity, and so, IMHO, also distracts a bit from the all-caps variables in the list. But as there are only three such headings, it's not really that important (if there were more, my preference towards .Ss Normal Case would be much stronger). But that's not my yak to shave... :) I was just reacting to that confusing statement in the commit message. mdoc has enough urban legends and cargo cult around it... > My goal is to get the mk.conf(5) up to date and correct, and more usable. > I intend to remove the duplication in BUILDING and bsd.README > and refer back to mk.conf(5) to avoid the copypasta, with some updated > boilerplate in BUILDING to describe how to find the referenced manual pages > within BUILDING if you're not on an NetBSD system. That would be very nice, thanks. -uwe
Re: CVS commit: src/share/man/man5
On 23-06-11 14:14, Valery Ushakov wrote: | On Sun, Jun 11, 2023 at 10:44:33 +, Luke Mewburn wrote: | | > Module Name: src | > Committed By: lukem | > Date: Sun Jun 11 10:44:33 UTC 2023 | > | > Modified Files: | > src/share/man/man5: mk.conf.5 | > | > Log Message: | [...] | > Change sub headings to headings; it's easier to read. | > (I don't know why mdoc doesn't allow blank lines around .Ss) | | I'm not sure what do you mean. The difference between .Ss and .Sh is | only the indent: | | 8<[ .Ss ]8< | ... | the system. | |NetBSD System Variables | Listed below are the mk.conf variables that may be set that affect the | ... | 8<8< | | vs. | | 8<[ .Sh ]8< | ... | the system. | | NetBSD System Variables | Listed below are the mk.conf variables that may be set that affect the | ... | 8<8< | | Both have a blank line before and no blank line after. Ahh, you're right, I misspoke. Tired brain when working on the commit. IMHO, they both suffer from lack of blank line there, where personally I would prefer the blank line, especially before a list, and especially for .Ss because its indent is only 2 in from the main paragraph. But I'm not considering an mdoc change for that any time soon. Compare: 8<[ old ]8< DESCRIPTION The mk.conf file overrides various parameters used during the build of the system. Listed below are the mk.conf variables that may be set, the values to which each may be set, a brief description of what each variable does, and a reference to relevant manual pages. NetBSD System variables BSDOBJDIR The real path to the object directory tree for the NetBSD source tree. 8<8< vs using .Sh (for outdenting) and a textual para before: 8<[ new ]8< DESCRIPTION The mk.conf file overrides various parameters used during the build of the system. NETBSD SYSTEM VARIABLES Listed below are the mk.conf variables that may be set that affect the NetBSD NetBSD system build, the values to which each may be set, a brief description of what each variable does, references to relevant manual pages, notes (including any interaction with build.sh), and the default value of each variable. BSDOBJDIR The real path to the object directory tree for the NetBSD source tree. 8<8< For me, having a para before it and the outdented heading makes the BSDOBJDIR "pop" more in a quick eyeball scan, plus easier section searching. YMMV. My goal is to get the mk.conf(5) up to date and correct, and more usable. I intend to remove the duplication in BUILDING and bsd.README and refer back to mk.conf(5) to avoid the copypasta, with some updated boilerplate in BUILDING to describe how to find the referenced manual pages within BUILDING if you're not on an NetBSD system. Luke.
Re: CVS commit: src/share/man/man5
On Sun, Jun 11, 2023 at 10:44:33 +, Luke Mewburn wrote: > Module Name: src > Committed By: lukem > Date: Sun Jun 11 10:44:33 UTC 2023 > > Modified Files: > src/share/man/man5: mk.conf.5 > > Log Message: [...] > Change sub headings to headings; it's easier to read. > (I don't know why mdoc doesn't allow blank lines around .Ss) I'm not sure what do you mean. The difference between .Ss and .Sh is only the indent: 8<[ .Ss ]8< ... the system. NetBSD System Variables Listed below are the mk.conf variables that may be set that affect the ... 8<8< vs. 8<[ .Sh ]8< ... the system. NetBSD System Variables Listed below are the mk.conf variables that may be set that affect the ... 8<8< Both have a blank line before and no blank line after. -uwe
CVS commit: src
Module Name:src Committed By: lukem Date: Sun Jun 11 10:49:44 UTC 2023 Modified Files: src: BUILDING src/doc: BUILDING.mdoc Log Message: BUILDING: update from mk.conf(5). reorder Sync variable entries from mk.conf(5). Merge the "make variables for full builds" section into the previous. Having two separate sections and some entries duplicated was confusing when searching for variables. To generate a diff of this commit: cvs rdiff -u -r1.153 -r1.154 src/BUILDING cvs rdiff -u -r1.142 -r1.143 src/doc/BUILDING.mdoc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/BUILDING diff -u src/BUILDING:1.153 src/BUILDING:1.154 --- src/BUILDING:1.153 Sun Jun 11 10:43:51 2023 +++ src/BUILDING Sun Jun 11 10:49:43 2023 @@ -232,8 +232,21 @@ CONFIGURATION Default: Unset. - CPUFLAGSAdditional flags to the compiler/assembler to select CPU - instruction set options, CPU tuning options, etc. + COPTS Extra options for the C compiler. Should be appended to + (e.g., COPTS+=-g), rather than explicitly set. + + Note: CPUFLAGS, not COPTS, should be used for compiler + flags that select CPU-related options. + + Note: CFLAGS should never be set in mk.conf(5). + + CPUFLAGSAdditional options passed to the compiler/assembler to + select CPU instruction set options, CPU tuning options, + etc. + + Note: Such options should not be specified in COPTS, + because some parts of the build process need to override + CPU-related compiler options. Default: Unset. @@ -247,11 +260,11 @@ CONFIGURATION The directory must reside on a file system which supports long file names and hard links. - Note: build.sh will provide a default of destdir.MACHINE - (in the top-level .OBJDIR) unless run in `expert' mode. + Note: build.sh will provide a default of + "destdir.MACHINE" (in the top-level .OBJDIR) unless run + in `expert' mode. - Default: Empty string if USETOOLS is "yes"; unset - otherwise. + Default: Empty string if USETOOLS=yes; unset otherwise. EXTERNAL_TOOLCHAIN If defined, this variable indicates the root directory of @@ -275,6 +288,18 @@ CONFIGURATION Default: Unset. + INSTALLBOOT_BOARDS + A list of evbarm boards to create bootable images for. + If corresponding U-Boot packages are installed, bootable + images are created as part of a release. See the + -o board=name option of installboot(8). + + INSTALLWORLDDIR + Location for the top-level "make installworld" target to + install to. If specified, must be an absolute path. + + Default: "/" + MAKEVERBOSE Level of verbosity of status messages. Supported values: 0 No descriptive messages or commands executed by @@ -359,20 +384,20 @@ CONFIGURATION Default: "yes" - MKHOSTOBJ Can be set to "yes" or "no". If set to "yes", then for - programs intended to be run on the compile host, the - name, release, and architecture of the host operating - system will be suffixed to the name of the object - directory created by "make obj". (This allows multiple - host systems to compile NetBSD for a single target.) If - set to "no", then programs built to be run on the compile - host will use the same object directory names as programs - built to be run on the target. + MKHOSTOBJ Can be set to "yes" or "no". If "yes", then for programs + intended to be run on the compile host, the name, + release, and architecture of the host operating system + will be suffixed to the name of the object directory + created by "make obj". (This allows multiple host + systems to compile NetBSD for a single target + architecture.) If "no", then programs built to be run on + the compile host will use the same object directory names + as programs built to be run on the target architecture. Default: "no" MKHTML Can be set to "yes" or "no". Indicates whether the HTML -
CVS commit: src
Module Name:src Committed By: lukem Date: Sun Jun 11 10:49:44 UTC 2023 Modified Files: src: BUILDING src/doc: BUILDING.mdoc Log Message: BUILDING: update from mk.conf(5). reorder Sync variable entries from mk.conf(5). Merge the "make variables for full builds" section into the previous. Having two separate sections and some entries duplicated was confusing when searching for variables. To generate a diff of this commit: cvs rdiff -u -r1.153 -r1.154 src/BUILDING cvs rdiff -u -r1.142 -r1.143 src/doc/BUILDING.mdoc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man5
Module Name:src Committed By: lukem Date: Sun Jun 11 10:44:33 UTC 2023 Modified Files: src/share/man/man5: mk.conf.5 Log Message: mk.conf(5): add remaining vars from BUILDING Add more variables from BUILDING: INSTALLBOOT_BOARDS INSTALLWORLDDIR NOCLEANDIR NODISTRIBDIRS NOINCLUDES. Add build.sh related notes (from BUILDING). Clarify "target" as "target architecture" where appropriate (versus a make target where that's obvious from context.) Move all obsolete and deprecated variables to new "OBSOLETE VARIABLES" section at the end. Add some per-variable editorial improvements from BUILDING. Change sub headings to headings; it's easier to read. (I don't know why mdoc doesn't allow blank lines around .Ss) To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/share/man/man5/mk.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man5/mk.conf.5 diff -u src/share/man/man5/mk.conf.5:1.101 src/share/man/man5/mk.conf.5:1.102 --- src/share/man/man5/mk.conf.5:1.101 Mon Jun 5 22:35:20 2023 +++ src/share/man/man5/mk.conf.5 Sun Jun 11 10:44:33 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: mk.conf.5,v 1.101 2023/06/05 22:35:20 lukem Exp $ +.\" $NetBSD: mk.conf.5,v 1.102 2023/06/11 10:44:33 lukem Exp $ .\" .\" Copyright (c) 1999-2023 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 5, 2023 +.Dd June 11, 2023 .Dt MK.CONF 5 .Os .\" turn off hyphenation @@ -41,14 +41,20 @@ The .Nm file overrides various parameters used during the build of the system. -.Pp +. +.Sh NETBSD SYSTEM VARIABLES +. Listed below are the .Nm -variables that may be set, the values to which each may be set, -a brief description of what each variable does, and a reference to -relevant manual pages. -. -.Ss NetBSD System variables +variables that may be set that affect the +.Nx NetBSD +system build, +the values to which each may be set, +a brief description of what each variable does, +references to relevant manual pages, +notes (including any interaction with +.Sy build.sh ) , +and the default value of each variable. . .de DFLT .Pp @@ -190,12 +196,15 @@ should never be set in .Nm . . .It Sy CPUFLAGS -Additional flags passed to the compiler/assembler to select +Additional options passed to the compiler/assembler to select CPU instruction set options, CPU tuning options, etc. +.Pp +.Em Note : Such options should not be specified in .Sy COPTS , because some parts of the build process need to override CPU-related compiler options. +.DFLTu . .It Sy DESTDIR Directory to contain the built @@ -205,13 +214,15 @@ If set, special options are passed to th prevent their default use of the host system's .Sy /usr/include , /usr/lib , and so forth. -This pathname should +This pathname must be an absolute path, and should .Em not end with a slash .Pq / -character (for installation into the system's root directory, set +character. +(For installation into the system's root directory, set .Sy DESTDIR -to an empty string). +to an empty string, not to +.Dq / ) . The directory must reside on a file system which supports long file names and hard links. .Pp @@ -223,7 +234,7 @@ will provide a default of .Sy .OBJDIR ) unless run in .Sq expert -mode +mode. .DFLT Empty string if .Sy USETOOLS=yes ; @@ -257,8 +268,27 @@ Expect the exact semantics of this varia term as parts of the cross-compile framework continue to be cleaned up. .DFLTu . -.It Sy EXTSRCSRCDIR -Obsolete. +.It Sy INSTALLBOOT_BOARDS +A list of +.Sy evbarm +boards to create bootable images for. +If corresponding U-Boot packages are installed, +bootable images are created as part of a release. +See the +.Bk -words +.Fl o Sy board= Ns Ar name +.Ek +option of +.Xr installboot 8 . +.DFLTu +. +.It Sy INSTALLWORLDDIR +Location for the top-level +.Dq make installworld +target to install to. +If specified, must be an absolute path. +.DFLT +.Dq / . .It Sy KERNEL_DIR Pq No experimental .YorN @@ -303,17 +333,17 @@ are shown. Brief messages are shown describing what is being done, but the actual commands executed by .Xr make 1 -are not displayed. +are not shown. .It 2 Descriptive messages are shown as above (prefixed with a .Sq # ) , and ordinary commands performed by .Xr make 1 -are displayed. +are shown. .It 3 In addition to the above, all commands performed by .Xr make 1 -are displayed, even if they would ordinarily have been hidden +are shown, even if they would ordinarily have been hidden through use of the .Dq \&@ prefix in the relevant makefile. @@ -371,10 +401,6 @@ as the tests rely on ATF and cannot be b .NOVAR MKCXX=no .DFLTy . -.It Sy MKBFD -Obsolete, use -.Sy MKBINUTILS . -. .It Sy MKBINUTILS .YorN Indicates whether any of the binutils tools or
CVS commit: src/share/man/man5
Module Name:src Committed By: lukem Date: Sun Jun 11 10:44:33 UTC 2023 Modified Files: src/share/man/man5: mk.conf.5 Log Message: mk.conf(5): add remaining vars from BUILDING Add more variables from BUILDING: INSTALLBOOT_BOARDS INSTALLWORLDDIR NOCLEANDIR NODISTRIBDIRS NOINCLUDES. Add build.sh related notes (from BUILDING). Clarify "target" as "target architecture" where appropriate (versus a make target where that's obvious from context.) Move all obsolete and deprecated variables to new "OBSOLETE VARIABLES" section at the end. Add some per-variable editorial improvements from BUILDING. Change sub headings to headings; it's easier to read. (I don't know why mdoc doesn't allow blank lines around .Ss) To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/share/man/man5/mk.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: lukem
Date: Sun Jun 11 10:43:51 UTC 2023
Modified Files:
src: BUILDING Makefile
src/doc: BUILDING.mdoc
src/etc: Makefile.params
Log Message:
more NBUILDJOBS deprecation
The NBUILDJOBS option was deprecated in 2002;
there's no need to keep warning about it,
remove from params / show-params,
and only document as obsolete.
To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 src/BUILDING
cvs rdiff -u -r1.336 -r1.337 src/Makefile
cvs rdiff -u -r1.141 -r1.142 src/doc/BUILDING.mdoc
cvs rdiff -u -r1.22 -r1.23 src/etc/Makefile.params
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/BUILDING
diff -u src/BUILDING:1.152 src/BUILDING:1.153
--- src/BUILDING:1.152 Mon Jun 5 22:36:17 2023
+++ src/BUILDING Sun Jun 11 10:43:51 2023
@@ -676,11 +676,6 @@ CONFIGURATION
If using build.sh, this may be set by giving the -u
option.
- NBUILDJOBS Now obsolete. Use the make(1) option -j, instead. See
- below.
-
- Default: Unset.
-
NOCLEANDIR If set, avoids the "make cleandir" phase of a full build.
This has the effect of allowing only changed files in a
source tree to be recompiled. This can speed up builds
@@ -1293,7 +1288,7 @@ EXAMPLES
the release build.
OBSOLETE VARIABLES
- NBUILDJOBS Use the make(1) option -j instead.
+ NBUILDJOBS Use the build.sh and make(1) option -j instead.
USE_NEW_TOOLCHAIN
The new toolchain is now the default. To disable, use
@@ -1316,4 +1311,4 @@ CAVEATS
in object directories. Instead, one may have to manually remove the
files. Consult the UPDATING file for notices concerning this.
-NetBSD June 5, 2023 NetBSD
+NetBSD June 10, 2023 NetBSD
Index: src/Makefile
diff -u src/Makefile:1.336 src/Makefile:1.337
--- src/Makefile:1.336 Fri Jun 2 20:48:09 2023
+++ src/Makefile Sun Jun 11 10:43:51 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.336 2023/06/02 20:48:09 lukem Exp $
+# $NetBSD: Makefile,v 1.337 2023/06/11 10:43:51 lukem Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -446,9 +446,6 @@ check-tools: .PHONY
.elif defined(EXTERNAL_TOOLCHAIN)
@echo '*** Using external toolchain rooted at ${EXTERNAL_TOOLCHAIN}.'
.endif
-.if defined(NBUILDJOBS)
- @echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!'
-.endif
# Delete or sanitise a leftover METALOG from a previous build.
clean_METALOG: .PHONY .MAKE
Index: src/doc/BUILDING.mdoc
diff -u src/doc/BUILDING.mdoc:1.141 src/doc/BUILDING.mdoc:1.142
--- src/doc/BUILDING.mdoc:1.141 Mon Jun 5 22:36:17 2023
+++ src/doc/BUILDING.mdoc Sun Jun 11 10:43:51 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: BUILDING.mdoc,v 1.141 2023/06/05 22:36:17 lukem Exp $
+.\" $NetBSD: BUILDING.mdoc,v 1.142 2023/06/11 10:43:51 lukem Exp $
.\"
.\" Copyright (c) 2001-2023 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -33,7 +33,7 @@
.\" Toolchain prefix for commands
.ds toolprefix nb
.
-.Dd June 5, 2023
+.Dd June 10, 2023
.Dt BUILDING 8
.Os NetBSD
.\" turn off hyphenation
@@ -1169,16 +1169,6 @@ this may be set by giving the
.Fl u
option.
.
-.It Sy NBUILDJOBS
-Now obsolete.
-Use the
-.Xr make 1
-option
-.Fl j ,
-instead.
-See below.
-.DFLTu
-.
.It Sy NOCLEANDIR
If set, avoids the
.Dq make cleandir
@@ -2432,6 +2422,8 @@ portion of the release build.
.
.It Sy NBUILDJOBS
Use the
+.Nm build.sh
+and
.Xr make 1
option
.Fl j
Index: src/etc/Makefile.params
diff -u src/etc/Makefile.params:1.22 src/etc/Makefile.params:1.23
--- src/etc/Makefile.params:1.22 Sun Feb 14 18:45:44 2021
+++ src/etc/Makefile.params Sun Jun 11 10:43:51 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.params,v 1.22 2021/02/14 18:45:44 pgoyette Exp $
+# $NetBSD: Makefile.params,v 1.23 2023/06/11 10:43:51 lukem Exp $
#
# Makefile fragment for printing build parameters.
#
@@ -50,7 +50,7 @@ RELEASEVARS= DISTRIBVER EXTERNAL_TOOLCHA
RELEASEVARS+= BSDOBJDIR BSDSRCDIR BUILDID BUILDINFO BUILDSEED \
DESTDIR KERNARCHDIR KERNCONFDIR KERNOBJDIR KERNSRCDIR MAKE \
KERNEL_DIR MAKECONF MAKEFLAGS MAKEOBJDIR MAKEOBJDIRPREFIX \
- MAKEVERBOSE NBUILDJOBS NETBSDSRCDIR OBJMACHINE OBJMACHINE_ARCH \
+ MAKEVERBOSE NETBSDSRCDIR OBJMACHINE OBJMACHINE_ARCH \
RELEASEDIR RELEASEMACHINEDIR TOOLDIR USR_OBJMACHINE X11SRCDIR
.endif
CVS commit: src
Module Name:src Committed By: lukem Date: Sun Jun 11 10:43:51 UTC 2023 Modified Files: src: BUILDING Makefile src/doc: BUILDING.mdoc src/etc: Makefile.params Log Message: more NBUILDJOBS deprecation The NBUILDJOBS option was deprecated in 2002; there's no need to keep warning about it, remove from params / show-params, and only document as obsolete. To generate a diff of this commit: cvs rdiff -u -r1.152 -r1.153 src/BUILDING cvs rdiff -u -r1.336 -r1.337 src/Makefile cvs rdiff -u -r1.141 -r1.142 src/doc/BUILDING.mdoc cvs rdiff -u -r1.22 -r1.23 src/etc/Makefile.params Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/etc/rc.d
On Sat, 10 Jun 2023 at 20:08, Martin Husemann wrote: > I don't like this commit, it mixes: > > - several text improvements (good!) > - one unrelated cosmetic change (rely on all rc.d scripts being installed >with x bit, so drop the "sh" from the manual invocation) Calling the rc.d script directly is how we teach people to do it in the NetBSD Guide: https://www.netbsd.org/docs/guide/en/chap-rc.html#chap-rc-scripts The usage message that rc.d scripts produce also shows executing them directly: # service sshd check /etc/rc.d/sshd: unknown directive 'check'. Usage: /etc/rc.d/sshd [fast|force|one](start stop restart rcvar keygen reload status poll) I think adopting a single convention across the board would be least confusing for users. Personally I like calling rc.d scripts using service(8) as it makes an effort to run the rc.d script as close as possible to how it is run from rc(8). I find setting the current working directory to / is especially prudent and noteworthy. However, it would appear that service(8) has a bug where it also relies on executing the rc.d script directly. In practise it would be rare to run into it, though, as we do seem to install rc.d scripts with all the execute bits set. The error service(8) outputs when no execute bits are set is "sshd does not exist in /etc/rc.d," which can be perplexing when /etc/rc.d/sshd clearly does exist. > - one unrelated and IMO unneded change (check if kern.entropy.needed >exists, only usefull for older branches) My thinking here is that it makes it simpler to keep the script in sync between branches. (I have not checked, but I guess the sysctl does not depend on kernel configuration then.) Kind regards, + Kimmo
