Module Name: src
Committed By: sevan
Date: Fri Apr 26 22:46:04 UTC 2019
Modified Files:
src/sys/arch/amd64/conf: ALL
src/sys/arch/amigappc/conf: NULL
src/sys/arch/dreamcast/conf: G1IDE GENERIC
src/sys/arch/evbarm/conf: ARMADILLO-IOT-G3 CUBOX CUBOX-I DUOVERO
GUMSTIX HDL_G HPT5325 IMX6UL-STARTER IYONIX MARVELL_NAS
MMNET_GENERIC MPCSA_GENERIC MV2120 NITROGEN6X OPENBLOCKS_A6
OPENBLOCKS_AX3 OVERO PEPPER SHEEVAPLUG
src/sys/arch/i386/conf: ALL
src/sys/arch/luna68k/conf: GENERIC INSTALL
src/sys/arch/macppc/conf: GENERIC_601
src/sys/arch/mmeye/conf: MMEYE_WLF
src/sys/arch/mvme68k/conf: GENERIC
src/sys/arch/playstation2/conf: GENERIC
src/sys/arch/sparc/conf: KRUPS
src/sys/arch/sun2/conf: GENERIC
src/sys/arch/sun3/conf: GENERIC GENERIC3X
src/sys/arch/vax/conf: VAX780
src/sys/arch/x68k/conf: GENERIC
Log Message:
Use veriexec.config to reduce duplication
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/amigappc/conf/NULL
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/dreamcast/conf/G1IDE
cvs rdiff -u -r1.131 -r1.132 src/sys/arch/dreamcast/conf/GENERIC
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/CUBOX
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/conf/CUBOX-I
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/DUOVERO
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/evbarm/conf/GUMSTIX
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/evbarm/conf/HDL_G
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/evbarm/conf/HPT5325
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/conf/IMX6UL-STARTER \
src/sys/arch/evbarm/conf/PEPPER
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/IYONIX
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/conf/MARVELL_NAS
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/evbarm/conf/MMNET_GENERIC
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/evbarm/conf/MPCSA_GENERIC
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbarm/conf/MV2120
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/conf/NITROGEN6X
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/conf/OPENBLOCKS_A6
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/evbarm/conf/OVERO
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/evbarm/conf/SHEEVAPLUG
cvs rdiff -u -r1.466 -r1.467 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.126 -r1.127 src/sys/arch/luna68k/conf/GENERIC
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/luna68k/conf/INSTALL
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/macppc/conf/GENERIC_601
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/mmeye/conf/MMEYE_WLF
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/mvme68k/conf/GENERIC
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/playstation2/conf/GENERIC
cvs rdiff -u -r1.80 -r1.81 src/sys/arch/sparc/conf/KRUPS
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/sun2/conf/GENERIC
cvs rdiff -u -r1.180 -r1.181 src/sys/arch/sun3/conf/GENERIC
cvs rdiff -u -r1.133 -r1.134 src/sys/arch/sun3/conf/GENERIC3X
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/vax/conf/VAX780
cvs rdiff -u -r1.195 -r1.196 src/sys/arch/x68k/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.117 src/sys/arch/amd64/conf/ALL:1.118
--- src/sys/arch/amd64/conf/ALL:1.117 Fri Apr 12 04:46:48 2019
+++ src/sys/arch/amd64/conf/ALL Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.117 2019/04/12 04:46:48 msaitoh Exp $
+# $NetBSD: ALL,v 1.118 2019/04/26 22:46:03 sevan Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.117 $"
+#ident "ALL-$Revision: 1.118 $"
maxusers 64 # estimated number of users
@@ -1707,19 +1707,8 @@ pseudo-device dmoverio
pseudo-device nandemulator
-options FILEASSOC # fileassoc(9) - required for Veriexec
- # and PAX_SEGVGUARD
-
# Veriexec
-pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-options VERIFIED_EXEC_FP_SHA256
-options VERIFIED_EXEC_FP_SHA384
-options VERIFIED_EXEC_FP_SHA512
+include "dev/veriexec.config"
options PAX_SEGVGUARD=0 # PaX Segmentation fault guard
options PAX_MPROTECT=1 # PaX mprotect(2) restrictions
Index: src/sys/arch/amigappc/conf/NULL
diff -u src/sys/arch/amigappc/conf/NULL:1.55 src/sys/arch/amigappc/conf/NULL:1.56
--- src/sys/arch/amigappc/conf/NULL:1.55 Wed Aug 1 20:04:10 2018
+++ src/sys/arch/amigappc/conf/NULL Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: NULL,v 1.55 2018/08/01 20:04:10 maxv Exp $
+# $NetBSD: NULL,v 1.56 2019/04/26 22:46:03 sevan Exp $
#
# NULL machine description file
#
@@ -7,7 +7,7 @@ include "arch/amigappc/conf/std.amigappc
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.55 $"
+#ident "GENERIC-$Revision: 1.56 $"
maxusers 8
@@ -413,17 +413,7 @@ pseudo-device ksyms # /dev/ksyms (kern
#pseudo-device nsmb # experimental - SMB requester
# Veriexec
-#
-# a pseudo device needed for veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
# Kernel root file system and dump configuration
config netbsd root on ? type ?
Index: src/sys/arch/dreamcast/conf/G1IDE
diff -u src/sys/arch/dreamcast/conf/G1IDE:1.6 src/sys/arch/dreamcast/conf/G1IDE:1.7
--- src/sys/arch/dreamcast/conf/G1IDE:1.6 Wed Aug 1 20:04:10 2018
+++ src/sys/arch/dreamcast/conf/G1IDE Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: G1IDE,v 1.6 2018/08/01 20:04:10 maxv Exp $
+# $NetBSD: G1IDE,v 1.7 2019/04/26 22:46:03 sevan Exp $
include "arch/dreamcast/conf/std.dreamcast"
@@ -219,14 +219,4 @@ pseudo-device wsmux # mouse & keyboard
pseudo-device ksyms # /dev/ksyms
# Veriexec
-#
-# a pseudo device needed for veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
Index: src/sys/arch/dreamcast/conf/GENERIC
diff -u src/sys/arch/dreamcast/conf/GENERIC:1.131 src/sys/arch/dreamcast/conf/GENERIC:1.132
--- src/sys/arch/dreamcast/conf/GENERIC:1.131 Sat Apr 13 08:22:59 2019
+++ src/sys/arch/dreamcast/conf/GENERIC Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.131 2019/04/13 08:22:59 isaki Exp $
+# $NetBSD: GENERIC,v 1.132 2019/04/26 22:46:03 sevan Exp $
#
# GENERIC machine description file
#
@@ -220,14 +220,4 @@ pseudo-device wsmux # mouse & keyboard
pseudo-device ksyms # /dev/ksyms
# Veriexec
-#
-# a pseudo device needed for veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
Index: src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3
diff -u src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.16 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.17
--- src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.16 Wed Dec 19 16:56:17 2018
+++ src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3 Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO-IOT-G3,v 1.16 2018/12/19 16:56:17 skrll Exp $
+# $NetBSD: ARMADILLO-IOT-G3,v 1.17 2019/04/26 22:46:03 sevan Exp $
#
# ARMADILLO-IOT-G3 -- Atmark Techno, Armadillo-IoT G3
#
@@ -371,21 +371,8 @@ pseudo-device wsfont
# userland interface to drivers, including autoconf and properties retrieval
pseudo-device drvctl
-options FILEASSOC # fileassoc(9) - required for Veriexec
- # and PAX_SEGVGUARD
-
# Veriexec
-#
-# a pseudo device needed for veriexec
-pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-options VERIFIED_EXEC_FP_SHA256
-options VERIFIED_EXEC_FP_SHA384
-options VERIFIED_EXEC_FP_SHA512
+include "dev/veriexec.config"
options PAX_SEGVGUARD=0 # PaX Segmentation fault guard
options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
Index: src/sys/arch/evbarm/conf/CUBOX
diff -u src/sys/arch/evbarm/conf/CUBOX:1.13 src/sys/arch/evbarm/conf/CUBOX:1.14
--- src/sys/arch/evbarm/conf/CUBOX:1.13 Tue Oct 23 19:58:52 2018
+++ src/sys/arch/evbarm/conf/CUBOX Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: CUBOX,v 1.13 2018/10/23 19:58:52 jdolecek Exp $
+# $NetBSD: CUBOX,v 1.14 2019/04/26 22:46:03 sevan Exp $
#
# CUBOX -- SolidRun Ltd. Cubox kernel
#
@@ -369,20 +369,8 @@ pseudo-device wsfont
# userland interface to drivers, including autoconf and properties retrieval
pseudo-device drvctl
-options FILEASSOC # fileassoc(9) - required for Veriexec
-
# Veriexec
-#
-# a pseudo device needed for veriexec
-pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-options VERIFIED_EXEC_FP_SHA256
-options VERIFIED_EXEC_FP_SHA384
-options VERIFIED_EXEC_FP_SHA512
+include "dev/veriexec.config"
options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
options PAX_ASLR=0 # PaX Address Space Layout Randomization
Index: src/sys/arch/evbarm/conf/CUBOX-I
diff -u src/sys/arch/evbarm/conf/CUBOX-I:1.19 src/sys/arch/evbarm/conf/CUBOX-I:1.20
--- src/sys/arch/evbarm/conf/CUBOX-I:1.19 Wed Dec 19 16:56:17 2018
+++ src/sys/arch/evbarm/conf/CUBOX-I Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: CUBOX-I,v 1.19 2018/12/19 16:56:17 skrll Exp $
+# $NetBSD: CUBOX-I,v 1.20 2019/04/26 22:46:03 sevan Exp $
#
# CuBox-i
# - http://www.solid-run.com/products/cubox-i-mini-computer/
@@ -394,21 +394,8 @@ pseudo-device wsfont
# userland interface to drivers, including autoconf and properties retrieval
pseudo-device drvctl
-options FILEASSOC # fileassoc(9) - required for Veriexec
- # and PAX_SEGVGUARD
-
# Veriexec
-#
-# a pseudo device needed for veriexec
-pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-options VERIFIED_EXEC_FP_SHA256
-options VERIFIED_EXEC_FP_SHA384
-options VERIFIED_EXEC_FP_SHA512
+include "dev/veriexec.config"
options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
options PAX_ASLR=0 # PaX Address Space Layout Randomization
Index: src/sys/arch/evbarm/conf/DUOVERO
diff -u src/sys/arch/evbarm/conf/DUOVERO:1.12 src/sys/arch/evbarm/conf/DUOVERO:1.13
--- src/sys/arch/evbarm/conf/DUOVERO:1.12 Tue Oct 23 19:58:52 2018
+++ src/sys/arch/evbarm/conf/DUOVERO Fri Apr 26 22:46:03 2019
@@ -1,5 +1,5 @@
#
-# $NetBSD: DUOVERO,v 1.12 2018/10/23 19:58:52 jdolecek Exp $
+# $NetBSD: DUOVERO,v 1.13 2019/04/26 22:46:03 sevan Exp $
#
# DUOOVERO -- Gumstix. Inc. DuoVero COMS platforms kernel
#
@@ -297,19 +297,8 @@ pseudo-device wsfont
# userland interface to drivers, including autoconf and properties retrieval
pseudo-device drvctl
-#options FILEASSOC # fileassoc(9) - required for Veriexec
- # and PAX_SEGVGUARD
-
# Veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
#options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
#options PAX_ASLR=0 # PaX Address Space Layout Randomization
Index: src/sys/arch/evbarm/conf/GUMSTIX
diff -u src/sys/arch/evbarm/conf/GUMSTIX:1.99 src/sys/arch/evbarm/conf/GUMSTIX:1.100
--- src/sys/arch/evbarm/conf/GUMSTIX:1.99 Tue Oct 23 19:58:52 2018
+++ src/sys/arch/evbarm/conf/GUMSTIX Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GUMSTIX,v 1.99 2018/10/23 19:58:52 jdolecek Exp $
+# $NetBSD: GUMSTIX,v 1.100 2019/04/26 22:46:03 sevan Exp $
#
# GUMSTIX -- Gumstix. Inc. gumstix platforms kernel
#
@@ -397,19 +397,8 @@ pseudo-device dmoverio # /dev/dmover dm
# userland interface to drivers, including autoconf and properties retrieval
pseudo-device drvctl
-#options FILEASSOC # fileassoc(9) - required for Veriexec
- # and PAX_SEGVGUARD
-
# Veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
#options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
#options PAX_ASLR=0 # PaX Address Space Layout Randomization
Index: src/sys/arch/evbarm/conf/HDL_G
diff -u src/sys/arch/evbarm/conf/HDL_G:1.56 src/sys/arch/evbarm/conf/HDL_G:1.57
--- src/sys/arch/evbarm/conf/HDL_G:1.56 Wed Feb 6 11:58:30 2019
+++ src/sys/arch/evbarm/conf/HDL_G Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: HDL_G,v 1.56 2019/02/06 11:58:30 rin Exp $
+# $NetBSD: HDL_G,v 1.57 2019/04/26 22:46:03 sevan Exp $
#
# HDL_G -- I-O DATA HDL-G Kernel
#
@@ -419,8 +419,8 @@ pseudo-device ksyms # /dev/ksyms
# a pseudo device needed for SMBFS
pseudo-device nsmb # experimental - SMB requester
-# a pseudo device needed for verified exec
-#pseudo-device veriexec
+# Veriexec
+# include "dev/veriexec.config"
# data mover pseudo-devices
pseudo-device swdmover # software dmover(9) back-end
Index: src/sys/arch/evbarm/conf/HPT5325
diff -u src/sys/arch/evbarm/conf/HPT5325:1.41 src/sys/arch/evbarm/conf/HPT5325:1.42
--- src/sys/arch/evbarm/conf/HPT5325:1.41 Wed Feb 6 11:58:30 2019
+++ src/sys/arch/evbarm/conf/HPT5325 Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: HPT5325,v 1.41 2019/02/06 11:58:30 rin Exp $
+# $NetBSD: HPT5325,v 1.42 2019/04/26 22:46:03 sevan Exp $
#
# This configuration supports for HP T5325 Thin Client
#
@@ -491,19 +491,8 @@ pseudo-device wsfont
#pseudo-device swdmover # software dmover(9) back-end
#pseudo-device dmoverio # /dev/dmover dmover(9) interface
-#options FILEASSOC # fileassoc(9) - required for Veriexec
- # and PAX_SEGVGUARD
-
# Veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
#options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
#options PAX_ASLR=0 # PaX Address Space Layout Randomization
Index: src/sys/arch/evbarm/conf/IMX6UL-STARTER
diff -u src/sys/arch/evbarm/conf/IMX6UL-STARTER:1.11 src/sys/arch/evbarm/conf/IMX6UL-STARTER:1.12
--- src/sys/arch/evbarm/conf/IMX6UL-STARTER:1.11 Wed Dec 19 16:56:17 2018
+++ src/sys/arch/evbarm/conf/IMX6UL-STARTER Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: IMX6UL-STARTER,v 1.11 2018/12/19 16:56:17 skrll Exp $
+# $NetBSD: IMX6UL-STARTER,v 1.12 2019/04/26 22:46:03 sevan Exp $
#
# IMX6UL-STARTER - Freescale i.MX6UL Evaluation Board
#
@@ -384,21 +384,8 @@ pseudo-device wsfont
# userland interface to drivers, including autoconf and properties retrieval
pseudo-device drvctl
-options FILEASSOC # fileassoc(9) - required for Veriexec
- # and PAX_SEGVGUARD
-
# Veriexec
-#
-# a pseudo device needed for veriexec
-pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-options VERIFIED_EXEC_FP_SHA256
-options VERIFIED_EXEC_FP_SHA384
-options VERIFIED_EXEC_FP_SHA512
+include "dev/veriexec.config"
options PAX_SEGVGUARD=0 # PaX Segmentation fault guard
options PAX_MPROTECT=1 # PaX mprotect(2) restrictions
Index: src/sys/arch/evbarm/conf/PEPPER
diff -u src/sys/arch/evbarm/conf/PEPPER:1.11 src/sys/arch/evbarm/conf/PEPPER:1.12
--- src/sys/arch/evbarm/conf/PEPPER:1.11 Tue Oct 23 19:58:52 2018
+++ src/sys/arch/evbarm/conf/PEPPER Fri Apr 26 22:46:03 2019
@@ -1,5 +1,5 @@
#
-# $NetBSD: PEPPER,v 1.11 2018/10/23 19:58:52 jdolecek Exp $
+# $NetBSD: PEPPER,v 1.12 2019/04/26 22:46:03 sevan Exp $
#
# PEPPER -- Gumstix. Inc. Pepper Single Board Computer platforms kernel
#
@@ -360,19 +360,8 @@ pseudo-device wsfont
# userland interface to drivers, including autoconf and properties retrieval
pseudo-device drvctl
-#options FILEASSOC # fileassoc(9) - required for Veriexec
- # and PAX_SEGVGUARD
-
# Veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
#options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
#options PAX_ASLR=0 # PaX Address Space Layout Randomization
Index: src/sys/arch/evbarm/conf/IYONIX
diff -u src/sys/arch/evbarm/conf/IYONIX:1.1 src/sys/arch/evbarm/conf/IYONIX:1.2
--- src/sys/arch/evbarm/conf/IYONIX:1.1 Thu Feb 14 21:47:52 2019
+++ src/sys/arch/evbarm/conf/IYONIX Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: IYONIX,v 1.1 2019/02/14 21:47:52 macallan Exp $
+# $NetBSD: IYONIX,v 1.2 2019/04/26 22:46:03 sevan Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.iyonix"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1 $"
+#ident "GENERIC-$Revision: 1.2 $"
maxusers 32 # estimated number of users
@@ -406,18 +406,7 @@ pseudo-device ksyms # /dev/ksyms
pseudo-device wsmux # mouse & keyboard multiplexor
pseudo-device wsfont
-#options FILEASSOC # fileassoc(9) - required for Veriexec
- # and PAX_SEGVGUARD
-
# Veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
#options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
Index: src/sys/arch/evbarm/conf/MARVELL_NAS
diff -u src/sys/arch/evbarm/conf/MARVELL_NAS:1.33 src/sys/arch/evbarm/conf/MARVELL_NAS:1.34
--- src/sys/arch/evbarm/conf/MARVELL_NAS:1.33 Tue Oct 23 19:58:52 2018
+++ src/sys/arch/evbarm/conf/MARVELL_NAS Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: MARVELL_NAS,v 1.33 2018/10/23 19:58:52 jdolecek Exp $
+# $NetBSD: MARVELL_NAS,v 1.34 2019/04/26 22:46:03 sevan Exp $
#
# This configuration supports for generically Marvell NAS.
@@ -309,19 +309,8 @@ pseudo-device wsfont
pseudo-device swdmover # software dmover(9) back-end
pseudo-device dmoverio # /dev/dmover dmover(9) interface
-options FILEASSOC # fileassoc(9) - required for Veriexec
- # and PAX_SEGVGUARD
-
# Veriexec
-pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-options VERIFIED_EXEC_FP_SHA256
-options VERIFIED_EXEC_FP_SHA384
-options VERIFIED_EXEC_FP_SHA512
+include "dev/veriexec.config"
options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
options PAX_ASLR=0 # PaX Address Space Layout Randomization
Index: src/sys/arch/evbarm/conf/MMNET_GENERIC
diff -u src/sys/arch/evbarm/conf/MMNET_GENERIC:1.45 src/sys/arch/evbarm/conf/MMNET_GENERIC:1.46
--- src/sys/arch/evbarm/conf/MMNET_GENERIC:1.45 Wed Feb 6 11:58:30 2019
+++ src/sys/arch/evbarm/conf/MMNET_GENERIC Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: MMNET_GENERIC,v 1.45 2019/02/06 11:58:30 rin Exp $
+# $NetBSD: MMNET_GENERIC,v 1.46 2019/04/26 22:46:03 sevan Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mmnet"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.45 $"
+#ident "GENERIC-$Revision: 1.46 $"
maxusers 32 # estimated number of users
@@ -589,18 +589,7 @@ pseudo-device ksyms # /dev/ksyms
#pseudo-device wsmux # mouse & keyboard multiplexor
#pseudo-device wsfont
-#options FILEASSOC # fileassoc(9) - required for Veriexec
- # and PAX_SEGVGUARD
-
# Veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
Index: src/sys/arch/evbarm/conf/MPCSA_GENERIC
diff -u src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.66 src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.67
--- src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.66 Wed Feb 6 11:58:30 2019
+++ src/sys/arch/evbarm/conf/MPCSA_GENERIC Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: MPCSA_GENERIC,v 1.66 2019/02/06 11:58:30 rin Exp $
+# $NetBSD: MPCSA_GENERIC,v 1.67 2019/04/26 22:46:03 sevan Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mpcsa"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.66 $"
+#ident "GENERIC-$Revision: 1.67 $"
maxusers 32 # estimated number of users
@@ -654,18 +654,7 @@ pseudo-device ksyms # /dev/ksyms
#pseudo-device wsmux # mouse & keyboard multiplexor
#pseudo-device wsfont
-#options FILEASSOC # fileassoc(9) - required for Veriexec
- # and PAX_SEGVGUARD
-
# Veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
Index: src/sys/arch/evbarm/conf/MV2120
diff -u src/sys/arch/evbarm/conf/MV2120:1.39 src/sys/arch/evbarm/conf/MV2120:1.40
--- src/sys/arch/evbarm/conf/MV2120:1.39 Wed Feb 6 11:58:30 2019
+++ src/sys/arch/evbarm/conf/MV2120 Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: MV2120,v 1.39 2019/02/06 11:58:30 rin Exp $
+# $NetBSD: MV2120,v 1.40 2019/04/26 22:46:03 sevan Exp $
#
# This configuration supports for HP MV2120/MV5140/MV5150.
@@ -307,19 +307,8 @@ pseudo-device wsfont
pseudo-device dm
-options FILEASSOC # fileassoc(9) - required for Veriexec
- # and PAX_SEGVGUARD
-
# Veriexec
-pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-options VERIFIED_EXEC_FP_SHA256
-options VERIFIED_EXEC_FP_SHA384
-options VERIFIED_EXEC_FP_SHA512
+include "dev/veriexec.config"
options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
options PAX_ASLR=0 # PaX Address Space Layout Randomization
Index: src/sys/arch/evbarm/conf/NITROGEN6X
diff -u src/sys/arch/evbarm/conf/NITROGEN6X:1.21 src/sys/arch/evbarm/conf/NITROGEN6X:1.22
--- src/sys/arch/evbarm/conf/NITROGEN6X:1.21 Wed Dec 19 16:56:17 2018
+++ src/sys/arch/evbarm/conf/NITROGEN6X Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: NITROGEN6X,v 1.21 2018/12/19 16:56:17 skrll Exp $
+# $NetBSD: NITROGEN6X,v 1.22 2019/04/26 22:46:03 sevan Exp $
#
# Nitrogen6X
# - http://boundarydevices.com/products/nitrogen6x-board-imx6-arm-cortex-a9-sbc/
@@ -383,21 +383,8 @@ pseudo-device wsfont
# userland interface to drivers, including autoconf and properties retrieval
pseudo-device drvctl
-options FILEASSOC # fileassoc(9) - required for Veriexec
- # and PAX_SEGVGUARD
-
# Veriexec
-#
-# a pseudo device needed for veriexec
-pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-options VERIFIED_EXEC_FP_SHA256
-options VERIFIED_EXEC_FP_SHA384
-options VERIFIED_EXEC_FP_SHA512
+include "dev/veriexec.config"
options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
options PAX_ASLR=0 # PaX Address Space Layout Randomization
Index: src/sys/arch/evbarm/conf/OPENBLOCKS_A6
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.35 src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.36
--- src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.35 Wed Feb 6 11:58:30 2019
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_A6 Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS_A6,v 1.35 2019/02/06 11:58:30 rin Exp $
+# $NetBSD: OPENBLOCKS_A6,v 1.36 2019/04/26 22:46:03 sevan Exp $
#
# OPENBLOCKS_A6 -- Plat'Home. OpenBlockS A6 kernel
#
@@ -377,19 +377,8 @@ pseudo-device ksyms # /dev/ksyms
pseudo-device swdmover # software dmover(9) back-end
pseudo-device dmoverio # /dev/dmover dmover(9) interface
-#options FILEASSOC # fileassoc(9) - required for Veriexec
- # and PAX_SEGVGUARD
-
# Veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
#options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
#options PAX_ASLR=0 # PaX Address Space Layout Randomization
Index: src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.27 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.28
--- src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.27 Tue Oct 23 19:58:52 2018
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_AX3 Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: OPENBLOCKS_AX3,v 1.27 2018/10/23 19:58:52 jdolecek Exp $
+# $NetBSD: OPENBLOCKS_AX3,v 1.28 2019/04/26 22:46:03 sevan Exp $
#
# OPENBLOCKS_AX3 -- Plat'Home. OpenBlockS AX3 kernel
#
@@ -313,19 +313,8 @@ pseudo-device ksyms # /dev/ksyms
pseudo-device swdmover # software dmover(9) back-end
pseudo-device dmoverio # /dev/dmover dmover(9) interface
-#options FILEASSOC # fileassoc(9) - required for Veriexec
- # and PAX_SEGVGUARD
-
# Veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
#options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
#options PAX_ASLR=0 # PaX Address Space Layout Randomization
Index: src/sys/arch/evbarm/conf/OVERO
diff -u src/sys/arch/evbarm/conf/OVERO:1.54 src/sys/arch/evbarm/conf/OVERO:1.55
--- src/sys/arch/evbarm/conf/OVERO:1.54 Tue Oct 23 19:58:52 2018
+++ src/sys/arch/evbarm/conf/OVERO Fri Apr 26 22:46:03 2019
@@ -1,5 +1,5 @@
#
-# $NetBSD: OVERO,v 1.54 2018/10/23 19:58:52 jdolecek Exp $
+# $NetBSD: OVERO,v 1.55 2019/04/26 22:46:03 sevan Exp $
#
# OVERO -- Gumstix. Inc. Overo COMS platforms kernel
#
@@ -352,19 +352,8 @@ pseudo-device wsfont
# userland interface to drivers, including autoconf and properties retrieval
pseudo-device drvctl
-#options FILEASSOC # fileassoc(9) - required for Veriexec
- # and PAX_SEGVGUARD
-
# Veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
#options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
#options PAX_ASLR=0 # PaX Address Space Layout Randomization
Index: src/sys/arch/evbarm/conf/SHEEVAPLUG
diff -u src/sys/arch/evbarm/conf/SHEEVAPLUG:1.63 src/sys/arch/evbarm/conf/SHEEVAPLUG:1.64
--- src/sys/arch/evbarm/conf/SHEEVAPLUG:1.63 Wed Feb 6 11:58:30 2019
+++ src/sys/arch/evbarm/conf/SHEEVAPLUG Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: SHEEVAPLUG,v 1.63 2019/02/06 11:58:30 rin Exp $
+# $NetBSD: SHEEVAPLUG,v 1.64 2019/04/26 22:46:03 sevan Exp $
#
# This configuration supports for generically Marvell SheevaPlug
#
@@ -490,19 +490,8 @@ pseudo-device drvctl # device control
pseudo-device swdmover # software dmover(9) back-end
pseudo-device dmoverio # /dev/dmover dmover(9) interface
-#options FILEASSOC # fileassoc(9) - required for Veriexec
- # and PAX_SEGVGUARD
-
# Veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
#options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
#options PAX_ASLR=0 # PaX Address Space Layout Randomization
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.466 src/sys/arch/i386/conf/ALL:1.467
--- src/sys/arch/i386/conf/ALL:1.466 Fri Apr 12 04:46:48 2019
+++ src/sys/arch/i386/conf/ALL Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.466 2019/04/12 04:46:48 msaitoh Exp $
+# $NetBSD: ALL,v 1.467 2019/04/26 22:46:03 sevan Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.466 $"
+#ident "ALL-$Revision: 1.467 $"
maxusers 64 # estimated number of users
@@ -1834,19 +1834,8 @@ pseudo-device dmoverio
pseudo-device nandemulator
-options FILEASSOC # fileassoc(9) - required for Veriexec
- # and PAX_SEGVGUARD
-
# Veriexec
-pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-options VERIFIED_EXEC_FP_SHA256
-options VERIFIED_EXEC_FP_SHA384
-options VERIFIED_EXEC_FP_SHA512
+include "dev/veriexec.config"
options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
options PAX_ASLR=0 # PaX Address Space Layout Randomization
Index: src/sys/arch/luna68k/conf/GENERIC
diff -u src/sys/arch/luna68k/conf/GENERIC:1.126 src/sys/arch/luna68k/conf/GENERIC:1.127
--- src/sys/arch/luna68k/conf/GENERIC:1.126 Wed Aug 1 20:04:12 2018
+++ src/sys/arch/luna68k/conf/GENERIC Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.126 2018/08/01 20:04:12 maxv Exp $
+# $NetBSD: GENERIC,v 1.127 2019/04/26 22:46:03 sevan Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/luna68k/conf/std.luna68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.126 $"
+#ident "GENERIC-$Revision: 1.127 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -203,14 +203,4 @@ pseudo-device ksyms # /dev/ksyms
pseudo-device wsmux # mouse & keyboard multiplexsor
# Veriexec
-#
-# a pseudo device needed for veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
Index: src/sys/arch/luna68k/conf/INSTALL
diff -u src/sys/arch/luna68k/conf/INSTALL:1.26 src/sys/arch/luna68k/conf/INSTALL:1.27
--- src/sys/arch/luna68k/conf/INSTALL:1.26 Wed Aug 1 20:04:12 2018
+++ src/sys/arch/luna68k/conf/INSTALL Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.26 2018/08/01 20:04:12 maxv Exp $
+# $NetBSD: INSTALL,v 1.27 2019/04/26 22:46:03 sevan Exp $
#
# config for installation ramdisk kernel
#
@@ -178,14 +178,4 @@ pseudo-device pty # pseudo-terminals
#pseudo-device ksyms # /dev/ksyms
# Veriexec
-#
-# a pseudo device needed for veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
Index: src/sys/arch/macppc/conf/GENERIC_601
diff -u src/sys/arch/macppc/conf/GENERIC_601:1.23 src/sys/arch/macppc/conf/GENERIC_601:1.24
--- src/sys/arch/macppc/conf/GENERIC_601:1.23 Mon Jan 7 01:44:59 2019
+++ src/sys/arch/macppc/conf/GENERIC_601 Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_601,v 1.23 2019/01/07 01:44:59 scole Exp $
+# $NetBSD: GENERIC_601,v 1.24 2019/04/26 22:46:03 sevan Exp $
#
# GENERIC machine description file
#
@@ -28,7 +28,7 @@ include "arch/macppc/conf/std.macppc.60
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.23 $"
+ident "GENERIC-$Revision: 1.24 $"
maxusers 32
@@ -357,17 +357,7 @@ pseudo-device ksyms # /dev/ksyms
pseudo-device drvctl
# Veriexec
-#
-# a pseudo device needed for veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
#options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
Index: src/sys/arch/mmeye/conf/MMEYE_WLF
diff -u src/sys/arch/mmeye/conf/MMEYE_WLF:1.27 src/sys/arch/mmeye/conf/MMEYE_WLF:1.28
--- src/sys/arch/mmeye/conf/MMEYE_WLF:1.27 Sat Apr 13 08:23:00 2019
+++ src/sys/arch/mmeye/conf/MMEYE_WLF Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: MMEYE_WLF,v 1.27 2019/04/13 08:23:00 isaki Exp $
+# $NetBSD: MMEYE_WLF,v 1.28 2019/04/26 22:46:03 sevan Exp $
#
# MMEYE_WLF -- Brains Inc. MMEYE-WLF platforms kernel
#
@@ -22,7 +22,7 @@ include "arch/mmeye/conf/std.mmeye"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.27 $"
+#ident "GENERIC-$Revision: 1.28 $"
maxusers 16 # estimated number of users
@@ -263,14 +263,4 @@ pseudo-device btuart # Bluetooth HCI U
#options MEMORY_DISK_ROOT_SIZE=3074 # size of memory disk, in blocks
# Veriexec
-#
-# a pseudo device needed for veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
Index: src/sys/arch/mvme68k/conf/GENERIC
diff -u src/sys/arch/mvme68k/conf/GENERIC:1.99 src/sys/arch/mvme68k/conf/GENERIC:1.100
--- src/sys/arch/mvme68k/conf/GENERIC:1.99 Wed Aug 1 20:04:12 2018
+++ src/sys/arch/mvme68k/conf/GENERIC Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.99 2018/08/01 20:04:12 maxv Exp $
+# $NetBSD: GENERIC,v 1.100 2019/04/26 22:46:03 sevan Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/mvme68k/conf/std.mvme68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.99 $"
+#ident "GENERIC-$Revision: 1.100 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -143,17 +143,7 @@ pseudo-device ksyms # /dev/ksyms
#options RND_COM # use "com" randomness as well (BROKEN)
# Veriexec
-#
-# a pseudo device needed for veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
mainbus0 at root
Index: src/sys/arch/playstation2/conf/GENERIC
diff -u src/sys/arch/playstation2/conf/GENERIC:1.12 src/sys/arch/playstation2/conf/GENERIC:1.13
--- src/sys/arch/playstation2/conf/GENERIC:1.12 Tue Apr 16 23:14:34 2019
+++ src/sys/arch/playstation2/conf/GENERIC Fri Apr 26 22:46:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.12 2019/04/16 23:14:34 sevan Exp $
+# $NetBSD: GENERIC,v 1.13 2019/04/26 22:46:03 sevan Exp $
#
# GENERIC machine description file
#
@@ -42,14 +42,4 @@ config netbsd root on ? type ?
#makeoptions DEFGP="-G 48"
# Veriexec
-#
-# a pseudo device needed for veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
Index: src/sys/arch/sparc/conf/KRUPS
diff -u src/sys/arch/sparc/conf/KRUPS:1.80 src/sys/arch/sparc/conf/KRUPS:1.81
--- src/sys/arch/sparc/conf/KRUPS:1.80 Sat Apr 13 08:23:00 2019
+++ src/sys/arch/sparc/conf/KRUPS Fri Apr 26 22:46:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: KRUPS,v 1.80 2019/04/13 08:23:00 isaki Exp $
+# $NetBSD: KRUPS,v 1.81 2019/04/26 22:46:04 sevan Exp $
# From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
#
# Krups (JavaStation-NC) machine description file
@@ -8,7 +8,7 @@ include "arch/sparc/conf/std.sparc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "KRUPS-$Revision: 1.80 $"
+#ident "KRUPS-$Revision: 1.81 $"
maxusers 32
@@ -340,21 +340,8 @@ pseudo-device putter # for puffs and p
#pseudo-device fss # file system snapshot device
-#options FILEASSOC # fileassoc(9) - required for Veriexec
- # and PAX_SEGVGUARD
-
# Veriexec
-#
-# a pseudo device needed for veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
#options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
# (for static binaries only for now)
Index: src/sys/arch/sun2/conf/GENERIC
diff -u src/sys/arch/sun2/conf/GENERIC:1.101 src/sys/arch/sun2/conf/GENERIC:1.102
--- src/sys/arch/sun2/conf/GENERIC:1.101 Wed Aug 1 20:04:14 2018
+++ src/sys/arch/sun2/conf/GENERIC Fri Apr 26 22:46:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.101 2018/08/01 20:04:14 maxv Exp $
+# $NetBSD: GENERIC,v 1.102 2019/04/26 22:46:04 sevan Exp $
#
# GENERIC machine description file
#
@@ -25,7 +25,7 @@ include "arch/sun2/conf/std.sun2"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.101 $"
+#ident "GENERIC-$Revision: 1.102 $"
makeoptions COPTS="-Os" # optimize for size
@@ -287,14 +287,4 @@ pseudo-device pty # pseudo-terminals
pseudo-device ksyms # /dev/ksyms
# Veriexec
-#
-# a pseudo device needed for veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
Index: src/sys/arch/sun3/conf/GENERIC
diff -u src/sys/arch/sun3/conf/GENERIC:1.180 src/sys/arch/sun3/conf/GENERIC:1.181
--- src/sys/arch/sun3/conf/GENERIC:1.180 Wed Dec 19 13:57:50 2018
+++ src/sys/arch/sun3/conf/GENERIC Fri Apr 26 22:46:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.180 2018/12/19 13:57:50 maxv Exp $
+# $NetBSD: GENERIC,v 1.181 2019/04/26 22:46:04 sevan Exp $
#
# GENERIC machine description file
#
@@ -25,7 +25,7 @@ include "arch/sun3/conf/std.sun3"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.180 $"
+#ident "GENERIC-$Revision: 1.181 $"
makeoptions COPTS="-Os" # bootloader has size limit (~2MB)
@@ -288,14 +288,4 @@ pseudo-device clockctl # user control o
pseudo-device ksyms # /dev/ksyms
# Veriexec
-#
-# a pseudo device needed for veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
Index: src/sys/arch/sun3/conf/GENERIC3X
diff -u src/sys/arch/sun3/conf/GENERIC3X:1.133 src/sys/arch/sun3/conf/GENERIC3X:1.134
--- src/sys/arch/sun3/conf/GENERIC3X:1.133 Wed Dec 19 13:57:50 2018
+++ src/sys/arch/sun3/conf/GENERIC3X Fri Apr 26 22:46:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC3X,v 1.133 2018/12/19 13:57:50 maxv Exp $
+# $NetBSD: GENERIC3X,v 1.134 2019/04/26 22:46:04 sevan Exp $
# GENERIC Sun3X (3/80, 3/470)
# Supports root on: ie0, le0, sd*, ...
@@ -7,7 +7,7 @@ include "arch/sun3/conf/std.sun3x"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC3X-$Revision: 1.133 $"
+#ident "GENERIC3X-$Revision: 1.134 $"
makeoptions COPTS="-Os" # bootloader has size limit (~2MB)
@@ -274,14 +274,4 @@ pseudo-device clockctl # user control o
pseudo-device ksyms # /dev/ksyms
# Veriexec
-#
-# a pseudo device needed for veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
Index: src/sys/arch/vax/conf/VAX780
diff -u src/sys/arch/vax/conf/VAX780:1.28 src/sys/arch/vax/conf/VAX780:1.29
--- src/sys/arch/vax/conf/VAX780:1.28 Sat Dec 29 11:30:12 2018
+++ src/sys/arch/vax/conf/VAX780 Fri Apr 26 22:46:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: VAX780,v 1.28 2018/12/29 11:30:12 maxv Exp $
+# $NetBSD: VAX780,v 1.29 2019/04/26 22:46:04 sevan Exp $
#
# 11/780,750,730 machine description file
#
@@ -305,14 +305,4 @@ pseudo-device ksyms # /dev/ksyms
#pseudo-device wsmux # mouse & keyboard multiplexor
# Veriexec
-#
-# a pseudo device needed for veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
Index: src/sys/arch/x68k/conf/GENERIC
diff -u src/sys/arch/x68k/conf/GENERIC:1.195 src/sys/arch/x68k/conf/GENERIC:1.196
--- src/sys/arch/x68k/conf/GENERIC:1.195 Sat Apr 13 08:23:01 2019
+++ src/sys/arch/x68k/conf/GENERIC Fri Apr 26 22:46:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.195 2019/04/13 08:23:01 isaki Exp $
+# $NetBSD: GENERIC,v 1.196 2019/04/26 22:46:04 sevan Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/x68k/conf/std.x68k"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.195 $"
+#ident "GENERIC-$Revision: 1.196 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -505,14 +505,4 @@ pseudo-device ksyms # /dev/ksyms
#pseudo-device fss # file system snapshot device
# Veriexec
-#
-# a pseudo device needed for veriexec
-#pseudo-device veriexec
-#
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
-#
-#options VERIFIED_EXEC_FP_SHA256
-#options VERIFIED_EXEC_FP_SHA384
-#options VERIFIED_EXEC_FP_SHA512
+# include "dev/veriexec.config"
