Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Use veriexec.config to reduce duplication
details: https://anonhg.NetBSD.org/src/rev/99e5381c45a7
branches: trunk
changeset: 456200:99e5381c45a7
user: sevan <sevan%NetBSD.org@localhost>
date: Fri Apr 26 22:46:03 2019 +0000
description:
Use veriexec.config to reduce duplication
diffstat:
sys/arch/amd64/conf/ALL | 17 +++--------------
sys/arch/amigappc/conf/NULL | 16 +++-------------
sys/arch/dreamcast/conf/G1IDE | 14 ++------------
sys/arch/dreamcast/conf/GENERIC | 14 ++------------
sys/arch/evbarm/conf/ARMADILLO-IOT-G3 | 17 ++---------------
sys/arch/evbarm/conf/CUBOX | 16 ++--------------
sys/arch/evbarm/conf/CUBOX-I | 17 ++---------------
sys/arch/evbarm/conf/DUOVERO | 15 ++-------------
sys/arch/evbarm/conf/GUMSTIX | 15 ++-------------
sys/arch/evbarm/conf/HDL_G | 6 +++---
sys/arch/evbarm/conf/HPT5325 | 15 ++-------------
sys/arch/evbarm/conf/IMX6UL-STARTER | 17 ++---------------
sys/arch/evbarm/conf/IYONIX | 17 +++--------------
sys/arch/evbarm/conf/MARVELL_NAS | 15 ++-------------
sys/arch/evbarm/conf/MMNET_GENERIC | 17 +++--------------
sys/arch/evbarm/conf/MPCSA_GENERIC | 17 +++--------------
sys/arch/evbarm/conf/MV2120 | 15 ++-------------
sys/arch/evbarm/conf/NITROGEN6X | 17 ++---------------
sys/arch/evbarm/conf/OPENBLOCKS_A6 | 15 ++-------------
sys/arch/evbarm/conf/OPENBLOCKS_AX3 | 15 ++-------------
sys/arch/evbarm/conf/OVERO | 15 ++-------------
sys/arch/evbarm/conf/PEPPER | 15 ++-------------
sys/arch/evbarm/conf/SHEEVAPLUG | 15 ++-------------
sys/arch/i386/conf/ALL | 17 +++--------------
sys/arch/luna68k/conf/GENERIC | 16 +++-------------
sys/arch/luna68k/conf/INSTALL | 14 ++------------
sys/arch/macppc/conf/GENERIC_601 | 16 +++-------------
sys/arch/mmeye/conf/MMEYE_WLF | 16 +++-------------
sys/arch/mvme68k/conf/GENERIC | 16 +++-------------
sys/arch/playstation2/conf/GENERIC | 14 ++------------
sys/arch/sparc/conf/KRUPS | 19 +++----------------
sys/arch/sun2/conf/GENERIC | 16 +++-------------
sys/arch/sun3/conf/GENERIC | 16 +++-------------
sys/arch/sun3/conf/GENERIC3X | 16 +++-------------
sys/arch/vax/conf/VAX780 | 14 ++------------
sys/arch/x68k/conf/GENERIC | 16 +++-------------
36 files changed, 88 insertions(+), 470 deletions(-)
diffs (truncated from 1155 to 300 lines):
diff -r b75ac8d6785f -r 99e5381c45a7 sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL Fri Apr 26 22:29:20 2019 +0000
+++ b/sys/arch/amd64/conf/ALL Fri Apr 26 22:46:03 2019 +0000
@@ -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 @@
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 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
diff -r b75ac8d6785f -r 99e5381c45a7 sys/arch/amigappc/conf/NULL
--- a/sys/arch/amigappc/conf/NULL Fri Apr 26 22:29:20 2019 +0000
+++ b/sys/arch/amigappc/conf/NULL Fri Apr 26 22:46:03 2019 +0000
@@ -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 @@
#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 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 ?
diff -r b75ac8d6785f -r 99e5381c45a7 sys/arch/dreamcast/conf/G1IDE
--- a/sys/arch/dreamcast/conf/G1IDE Fri Apr 26 22:29:20 2019 +0000
+++ b/sys/arch/dreamcast/conf/G1IDE Fri Apr 26 22:46:03 2019 +0000
@@ -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 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"
diff -r b75ac8d6785f -r 99e5381c45a7 sys/arch/dreamcast/conf/GENERIC
--- a/sys/arch/dreamcast/conf/GENERIC Fri Apr 26 22:29:20 2019 +0000
+++ b/sys/arch/dreamcast/conf/GENERIC Fri Apr 26 22:46:03 2019 +0000
@@ -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 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"
diff -r b75ac8d6785f -r 99e5381c45a7 sys/arch/evbarm/conf/ARMADILLO-IOT-G3
--- a/sys/arch/evbarm/conf/ARMADILLO-IOT-G3 Fri Apr 26 22:29:20 2019 +0000
+++ b/sys/arch/evbarm/conf/ARMADILLO-IOT-G3 Fri Apr 26 22:46:03 2019 +0000
@@ -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 @@
# 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
diff -r b75ac8d6785f -r 99e5381c45a7 sys/arch/evbarm/conf/CUBOX
--- a/sys/arch/evbarm/conf/CUBOX Fri Apr 26 22:29:20 2019 +0000
+++ b/sys/arch/evbarm/conf/CUBOX Fri Apr 26 22:46:03 2019 +0000
@@ -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 @@
# 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
diff -r b75ac8d6785f -r 99e5381c45a7 sys/arch/evbarm/conf/CUBOX-I
--- a/sys/arch/evbarm/conf/CUBOX-I Fri Apr 26 22:29:20 2019 +0000
+++ b/sys/arch/evbarm/conf/CUBOX-I Fri Apr 26 22:46:03 2019 +0000
@@ -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 @@
# 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
diff -r b75ac8d6785f -r 99e5381c45a7 sys/arch/evbarm/conf/DUOVERO
--- a/sys/arch/evbarm/conf/DUOVERO Fri Apr 26 22:29:20 2019 +0000
+++ b/sys/arch/evbarm/conf/DUOVERO Fri Apr 26 22:46:03 2019 +0000
@@ -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 @@
# 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
diff -r b75ac8d6785f -r 99e5381c45a7 sys/arch/evbarm/conf/GUMSTIX
--- a/sys/arch/evbarm/conf/GUMSTIX Fri Apr 26 22:29:20 2019 +0000
+++ b/sys/arch/evbarm/conf/GUMSTIX Fri Apr 26 22:46:03 2019 +0000
@@ -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 @@
# 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
diff -r b75ac8d6785f -r 99e5381c45a7 sys/arch/evbarm/conf/HDL_G
--- a/sys/arch/evbarm/conf/HDL_G Fri Apr 26 22:29:20 2019 +0000
+++ b/sys/arch/evbarm/conf/HDL_G Fri Apr 26 22:46:03 2019 +0000
@@ -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 @@
# 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"
Home |
Main Index |
Thread Index |
Old Index