Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config(5): enable NTP option implicitly when PPS_SYNC option is enabled. 

PPS_SYNC requires NTP, but some code blocks are ifdef'ed without it,
thus allowing an attempt to build kernel with PPS_SYNC, and without NTP
(and it almost builds with one line change).

Update options(4) man page to reflect the change.

Solution suggested by riastradh.
This commit is contained in:
andvar 2023-09-03 19:38:58 +00:00
parent 87163b0196
commit 96dda13222
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
share/man/man4/options.4
View File

@ -1,4 +1,4 @@
.\" $NetBSD: options.4,v 1.526 2023/08/14 16:51:52 riastradh Exp $
.\" $NetBSD: options.4,v 1.527 2023/09/03 19:38:58 andvar Exp $
.\"
.\" Copyright (c) 1996
.\" Perry E. Metzger. All rights reserved.
@ -30,7 +30,7 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\"
.Dd May 7, 2022
.Dd September 3, 2023
.Dt OPTIONS 4
.Os
.Sh NAME
@ -1428,13 +1428,6 @@ fractional clock ticks at NTP time-format precision.
.It Cd options PPS_SYNC
This option enables a kernel serial line discipline for receiving time
phase signals from an external reference clock such as a radio clock.
.Po
The
.Em NTP
option (which see) must be on if the
.Em PPS_SYNC
option is used
.Pc .
Some reference clocks generate a Pulse Per Second (PPS) signal in
phase with their time source.
The
@ -1467,6 +1460,10 @@ currently supports this option in
.Xr com 4
and
.Xr zsc 4 .
.Pp
.Em NOTE :
Using this option will also enable
.Em options NTP .
.It Cd options SETUIDSCRIPTS
Allows scripts with the setuid bit set to execute as the effective
user rather than the real user, just like binary executables.

5
sys/conf/files
View File

@ -1,4 +1,4 @@
# $NetBSD: files,v 1.1307 2023/04/16 16:51:38 jmcneill Exp $
# $NetBSD: files,v 1.1308 2023/09/03 19:38:58 andvar Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@ -86,7 +86,8 @@ defparam opt_sysvparam.h SEMMAP SEMMNI SEMMNS SEMMNU SEMMSL SEMOPM
defparam opt_sysvparam.h SEMUME SEMUSZ SEMVMX SEMAEM
defparam opt_sysvparam.h SHMMAX SHMMIN SHMMNI SHMSEG SHMMAXPGS
defflag opt_ntp.h PPS_SYNC PPS_DEBUG NTP
defflag opt_ntp.h PPS_DEBUG NTP
defflag opt_ntp.h PPS_SYNC: NTP
defflag opt_ptm.h NO_DEV_PTM COMPAT_BSDPTY