Thu Feb 19 20:23:46 2009 UTC ()
Apply patch (requested by pooka in ticket #453):
Add puffs and putter to amd64, i386, macppc, and sparc64 GENERIC kernels.


(snj)
diff -r1.231.4.1 -r1.231.4.2 src/sys/arch/amd64/conf/GENERIC
diff -r1.915.2.2 -r1.915.2.3 src/sys/arch/i386/conf/GENERIC
diff -r1.271 -r1.271.4.1 src/sys/arch/macppc/conf/GENERIC
diff -r1.104 -r1.104.2.1 src/sys/arch/sparc64/conf/GENERIC
cvs diff -r1.231.4.1 -r1.231.4.2 src/sys/arch/amd64/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/amd64/conf/GENERIC 2009/02/02 22:12:34 1.231.4.1
+++ src/sys/arch/amd64/conf/GENERIC 2009/02/19 20:23:46 1.231.4.2
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.231.4.1 2009/02/02 22:12:34 snj Exp $ 1# $NetBSD: GENERIC,v 1.231.4.2 2009/02/19 20:23:46 snj Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/amd64/conf/std.amd64" 21include "arch/amd64/conf/std.amd64"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GENERIC-$Revision: 1.231.4.1 $" 25#ident "GENERIC-$Revision: 1.231.4.2 $"
26 26
27maxusers 64 # estimated number of users 27maxusers 64 # estimated number of users
28 28
29# delay between "rebooting ..." message and hardware reset, in milliseconds 29# delay between "rebooting ..." message and hardware reset, in milliseconds
30#options CPURESET_DELAY=2000 30#options CPURESET_DELAY=2000
31 31
32# This option allows you to force a serial console at the specified 32# This option allows you to force a serial console at the specified
33# I/O address. see console(4) for details. 33# I/O address. see console(4) for details.
34#options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600 34#options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600
35# you don't want the option below ON iff you are using the 35# you don't want the option below ON iff you are using the
36# serial console option of the new boot strap code. 36# serial console option of the new boot strap code.
37#options CONS_OVERRIDE # Always use above! independent of boot info 37#options CONS_OVERRIDE # Always use above! independent of boot info
38 38
@@ -143,26 +143,27 @@ file-system FDESC # /dev/fd @@ -143,26 +143,27 @@ file-system FDESC # /dev/fd
143file-system KERNFS # /kern 143file-system KERNFS # /kern
144file-system NULLFS # loopback file system 144file-system NULLFS # loopback file system
145file-system OVERLAY # overlay file system 145file-system OVERLAY # overlay file system
146file-system PORTAL # portal filesystem (still experimental) 146file-system PORTAL # portal filesystem (still experimental)
147file-system PROCFS # /proc 147file-system PROCFS # /proc
148file-system SMBFS # experimental - SMB/CIFS file-system 148file-system SMBFS # experimental - SMB/CIFS file-system
149file-system UMAPFS # NULLFS + uid and gid remapping 149file-system UMAPFS # NULLFS + uid and gid remapping
150file-system UNION # union file system 150file-system UNION # union file system
151file-system CODA # Coda File System; also needs vcoda (below) 151file-system CODA # Coda File System; also needs vcoda (below)
152file-system PTYFS # /dev/pts/N support 152file-system PTYFS # /dev/pts/N support
153file-system TMPFS # Efficient memory file-system 153file-system TMPFS # Efficient memory file-system
154#file-system UDF # experimental - OSTA UDF CD/DVD file-system 154#file-system UDF # experimental - OSTA UDF CD/DVD file-system
155#file-system HFS # experimental - Apple HFS+ (read-only) 155#file-system HFS # experimental - Apple HFS+ (read-only)
 156file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
156 157
157# File system options 158# File system options
158options QUOTA # UFS quotas 159options QUOTA # UFS quotas
159#options FFS_EI # FFS Endian Independent support 160#options FFS_EI # FFS Endian Independent support
160options SOFTDEP # FFS soft updates support. 161options SOFTDEP # FFS soft updates support.
161options WAPBL # File system journaling support - Experimental 162options WAPBL # File system journaling support - Experimental
162# Note that UFS_DIRHASH is suspected of causing kernel memory corruption. 163# Note that UFS_DIRHASH is suspected of causing kernel memory corruption.
163# It is not recommended for general use. 164# It is not recommended for general use.
164#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental 165#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
165options NFSSERVER # Network File System server 166options NFSSERVER # Network File System server
166#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and 167#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
167 # immutable) behave as system flags. 168 # immutable) behave as system flags.
168#options FFS_NO_SNAPSHOT # No FFS snapshot support 169#options FFS_NO_SNAPSHOT # No FFS snapshot support
@@ -1082,26 +1083,29 @@ pseudo-device vcoda 4 # coda minicache  @@ -1082,26 +1083,29 @@ pseudo-device vcoda 4 # coda minicache
1082# a pseudo device needed for SMBFS 1083# a pseudo device needed for SMBFS
1083pseudo-device nsmb # experimental - SMB requester 1084pseudo-device nsmb # experimental - SMB requester
1084 1085
1085# wscons pseudo-devices 1086# wscons pseudo-devices
1086pseudo-device wsmux # mouse & keyboard multiplexor 1087pseudo-device wsmux # mouse & keyboard multiplexor
1087pseudo-device wsfont 1088pseudo-device wsfont
1088 1089
1089# pseudo audio device driver 1090# pseudo audio device driver
1090pseudo-device pad 1091pseudo-device pad
1091 1092
1092# userland interface to drivers, including autoconf and properties retrieval 1093# userland interface to drivers, including autoconf and properties retrieval
1093pseudo-device drvctl 1094pseudo-device drvctl
1094 1095
 1096# Pass-to-Userspace TransporTER, required for puffs(4) and pud(4)
 1097pseudo-device putter
 1098
1095options FILEASSOC # fileassoc(9) - required for Veriexec 1099options FILEASSOC # fileassoc(9) - required for Veriexec
1096 1100
1097# Veriexec 1101# Veriexec
1098# 1102#
1099# a pseudo device needed for veriexec 1103# a pseudo device needed for veriexec
1100pseudo-device veriexec 1 1104pseudo-device veriexec 1
1101# 1105#
1102# Uncomment the fingerprint methods below that are desired. Note that 1106# Uncomment the fingerprint methods below that are desired. Note that
1103# removing fingerprint methods will have almost no impact on the kernel 1107# removing fingerprint methods will have almost no impact on the kernel
1104# code size. 1108# code size.
1105# 1109#
1106options VERIFIED_EXEC_FP_RMD160 1110options VERIFIED_EXEC_FP_RMD160
1107options VERIFIED_EXEC_FP_SHA256 1111options VERIFIED_EXEC_FP_SHA256
cvs diff -r1.915.2.2 -r1.915.2.3 src/sys/arch/i386/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/i386/conf/GENERIC 2009/02/02 22:12:34 1.915.2.2
+++ src/sys/arch/i386/conf/GENERIC 2009/02/19 20:23:46 1.915.2.3
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.915.2.2 2009/02/02 22:12:34 snj Exp $ 1# $NetBSD: GENERIC,v 1.915.2.3 2009/02/19 20:23:46 snj Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/i386/conf/std.i386" 21include "arch/i386/conf/std.i386"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GENERIC-$Revision: 1.915.2.2 $" 25#ident "GENERIC-$Revision: 1.915.2.3 $"
26 26
27maxusers 64 # estimated number of users 27maxusers 64 # estimated number of users
28 28
29makeoptions CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486, 29makeoptions CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486,
30 # tune for more modern 30 # tune for more modern
31 31
32# CPU-related options. 32# CPU-related options.
33options VM86 # virtual 8086 emulation 33options VM86 # virtual 8086 emulation
34options USER_LDT # user-settable LDT; used by WINE 34options USER_LDT # user-settable LDT; used by WINE
35 35
36# Enhanced SpeedStep Technology in the Pentium M 36# Enhanced SpeedStep Technology in the Pentium M
37options ENHANCED_SPEEDSTEP 37options ENHANCED_SPEEDSTEP
38#options EST_FREQ_USERWRITE # any user can set frequency 38#options EST_FREQ_USERWRITE # any user can set frequency
@@ -180,26 +180,27 @@ file-system FDESC # /dev/fd @@ -180,26 +180,27 @@ file-system FDESC # /dev/fd
180file-system KERNFS # /kern 180file-system KERNFS # /kern
181file-system NULLFS # loopback file system 181file-system NULLFS # loopback file system
182file-system OVERLAY # overlay file system 182file-system OVERLAY # overlay file system
183file-system PORTAL # portal filesystem (still experimental) 183file-system PORTAL # portal filesystem (still experimental)
184file-system PROCFS # /proc 184file-system PROCFS # /proc
185file-system UMAPFS # NULLFS + uid and gid remapping 185file-system UMAPFS # NULLFS + uid and gid remapping
186file-system UNION # union file system 186file-system UNION # union file system
187file-system CODA # Coda File System; also needs vcoda (below) 187file-system CODA # Coda File System; also needs vcoda (below)
188file-system SMBFS # experimental - CIFS; also needs nsmb (below) 188file-system SMBFS # experimental - CIFS; also needs nsmb (below)
189file-system PTYFS # /dev/ptm support 189file-system PTYFS # /dev/ptm support
190file-system TMPFS # Efficient memory file-system 190file-system TMPFS # Efficient memory file-system
191#file-system UDF # experimental - OSTA UDF CD/DVD file-system 191#file-system UDF # experimental - OSTA UDF CD/DVD file-system
192#file-system HFS # experimental - Apple HFS+ (read-only) 192#file-system HFS # experimental - Apple HFS+ (read-only)
 193file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
193 194
194# File system options 195# File system options
195options QUOTA # UFS quotas 196options QUOTA # UFS quotas
196#options FFS_EI # FFS Endian Independent support 197#options FFS_EI # FFS Endian Independent support
197options SOFTDEP # FFS soft updates support. 198options SOFTDEP # FFS soft updates support.
198options WAPBL # File system journaling support - Experimental 199options WAPBL # File system journaling support - Experimental
199# Note that UFS_DIRHASH is suspected of causing kernel memory corruption. 200# Note that UFS_DIRHASH is suspected of causing kernel memory corruption.
200# It is not recommended for general use. 201# It is not recommended for general use.
201#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental 202#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
202options NFSSERVER # Network File System server 203options NFSSERVER # Network File System server
203#options FFS_NO_SNAPSHOT # No FFS snapshot support 204#options FFS_NO_SNAPSHOT # No FFS snapshot support
204#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and 205#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
205 # immutable) behave as system flags. 206 # immutable) behave as system flags.
@@ -1514,26 +1515,29 @@ pseudo-device nsmb # experimental - SM @@ -1514,26 +1515,29 @@ pseudo-device nsmb # experimental - SM
1514# wscons pseudo-devices 1515# wscons pseudo-devices
1515pseudo-device wsmux # mouse & keyboard multiplexor 1516pseudo-device wsmux # mouse & keyboard multiplexor
1516pseudo-device wsfont 1517pseudo-device wsfont
1517 1518
1518# cmos(4) pseudo-device 1519# cmos(4) pseudo-device
1519pseudo-device cmos 1520pseudo-device cmos
1520 1521
1521# pseudo audio device driver 1522# pseudo audio device driver
1522pseudo-device pad 1523pseudo-device pad
1523 1524
1524# userland interface to drivers, including autoconf and properties retrieval 1525# userland interface to drivers, including autoconf and properties retrieval
1525pseudo-device drvctl 1526pseudo-device drvctl
1526 1527
 1528# Pass-to-Userspace TransporTER, required for puffs(4) and pud(4)
 1529pseudo-device putter
 1530
1527options FILEASSOC # fileassoc(9) - required for Veriexec 1531options FILEASSOC # fileassoc(9) - required for Veriexec
1528 1532
1529# Veriexec 1533# Veriexec
1530pseudo-device veriexec 1534pseudo-device veriexec
1531# 1535#
1532# Uncomment the fingerprint methods below that are desired. Note that 1536# Uncomment the fingerprint methods below that are desired. Note that
1533# removing fingerprint methods will have almost no impact on the kernel 1537# removing fingerprint methods will have almost no impact on the kernel
1534# code size. 1538# code size.
1535# 1539#
1536options VERIFIED_EXEC_FP_RMD160 1540options VERIFIED_EXEC_FP_RMD160
1537options VERIFIED_EXEC_FP_SHA256 1541options VERIFIED_EXEC_FP_SHA256
1538options VERIFIED_EXEC_FP_SHA384 1542options VERIFIED_EXEC_FP_SHA384
1539options VERIFIED_EXEC_FP_SHA512 1543options VERIFIED_EXEC_FP_SHA512
cvs diff -r1.271 -r1.271.4.1 src/sys/arch/macppc/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/macppc/conf/GENERIC 2008/10/07 12:43:32 1.271
+++ src/sys/arch/macppc/conf/GENERIC 2009/02/19 20:23:46 1.271.4.1
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.271 2008/10/07 12:43:32 pgoyette Exp $ 1# $NetBSD: GENERIC,v 1.271.4.1 2009/02/19 20:23:46 snj Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4#  4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/macppc/conf/std.macppc" 21include "arch/macppc/conf/std.macppc"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GENERIC-$Revision: 1.271 $" 25#ident "GENERIC-$Revision: 1.271.4.1 $"
26 26
27maxusers 32 27maxusers 32
28 28
29options ALTIVEC # Include AltiVec support 29options ALTIVEC # Include AltiVec support
30 30
31# Standard system options 31# Standard system options
32options INSECURE # disable kernel security levels 32options INSECURE # disable kernel security levels
33 33
34options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT 34options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
35options NTP # NTP phase/frequency locked loop 35options NTP # NTP phase/frequency locked loop
36options KTRACE # system call tracing via ktrace(1) 36options KTRACE # system call tracing via ktrace(1)
37 37
38options SYSVMSG # System V message queues 38options SYSVMSG # System V message queues
@@ -97,26 +97,27 @@ file-system MSDOSFS # MS-DOS file syst @@ -97,26 +97,27 @@ file-system MSDOSFS # MS-DOS file syst
97file-system FDESC # /dev/fd 97file-system FDESC # /dev/fd
98file-system KERNFS # /kern 98file-system KERNFS # /kern
99file-system NULLFS # loopback file system 99file-system NULLFS # loopback file system
100file-system OVERLAY # overlay file system 100file-system OVERLAY # overlay file system
101file-system PORTAL # portal filesystem (still experimental) 101file-system PORTAL # portal filesystem (still experimental)
102file-system PROCFS # /proc 102file-system PROCFS # /proc
103file-system UMAPFS # NULLFS + uid and gid remapping 103file-system UMAPFS # NULLFS + uid and gid remapping
104file-system UNION # union file system 104file-system UNION # union file system
105file-system SMBFS # CIFS; also needs nsmb (below) 105file-system SMBFS # CIFS; also needs nsmb (below)
106file-system PTYFS # /dev/pts/N support 106file-system PTYFS # /dev/pts/N support
107file-system TMPFS # Efficient memory file-system 107file-system TMPFS # Efficient memory file-system
108#file-system UDF # experimental - OSTA UDF CD/DVD file-system 108#file-system UDF # experimental - OSTA UDF CD/DVD file-system
109#file-system HFS # experimental - Apple HFS+ (read-only) 109#file-system HFS # experimental - Apple HFS+ (read-only)
 110file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
110 111
111# File system options 112# File system options
112options QUOTA # UFS quotas 113options QUOTA # UFS quotas
113#options FFS_EI # FFS Endian Independant support 114#options FFS_EI # FFS Endian Independant support
114options SOFTDEP # FFS soft updates support. 115options SOFTDEP # FFS soft updates support.
115options WAPBL # File system journaling support - Experimental 116options WAPBL # File system journaling support - Experimental
116#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental 117#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental
117options NFSSERVER # Network File System server 118options NFSSERVER # Network File System server
118#options FFS_NO_SNAPSHOT # No FFS snapshot support 119#options FFS_NO_SNAPSHOT # No FFS snapshot support
119#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and 120#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
120 # immutable) behave as system flags. 121 # immutable) behave as system flags.
121options APPLE_UFS # Apple UFS support in FFS 122options APPLE_UFS # Apple UFS support in FFS
122 123
@@ -586,26 +587,27 @@ pseudo-device stf # 6to4 IPv6 over IPv @@ -586,26 +587,27 @@ pseudo-device stf # 6to4 IPv6 over IPv
586pseudo-device vlan # IEEE 802.1q encapsulation 587pseudo-device vlan # IEEE 802.1q encapsulation
587pseudo-device bridge # simple inter-network bridging 588pseudo-device bridge # simple inter-network bridging
588#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too 589#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too
589pseudo-device agr # IEEE 802.3ad link aggregation 590pseudo-device agr # IEEE 802.3ad link aggregation
590pseudo-device pty # pseudo-terminals 591pseudo-device pty # pseudo-terminals
591pseudo-device rnd # /dev/random and in-kernel generator 592pseudo-device rnd # /dev/random and in-kernel generator
592pseudo-device openfirm # /dev/openfirm 593pseudo-device openfirm # /dev/openfirm
593pseudo-device wsmux # mouse and keyboard multiplexor 594pseudo-device wsmux # mouse and keyboard multiplexor
594pseudo-device clockctl # user control of clock subsystem 595pseudo-device clockctl # user control of clock subsystem
595pseudo-device ksyms # /dev/ksyms 596pseudo-device ksyms # /dev/ksyms
596pseudo-device nsmb # SMB requester 597pseudo-device nsmb # SMB requester
597#pseudo-device pf # PF packet filter 598#pseudo-device pf # PF packet filter
598#pseudo-device pflog # PF log if 599#pseudo-device pflog # PF log if
 600pseudo-device putter # for puffs(4) and pud(4)
599 601
600# Veriexec 602# Veriexec
601# 603#
602# a pseudo device needed for veriexec 604# a pseudo device needed for veriexec
603#pseudo-device veriexec 1 605#pseudo-device veriexec 1
604# 606#
605# Uncomment the fingerprint methods below that are desired. Note that 607# Uncomment the fingerprint methods below that are desired. Note that
606# removing fingerprint methods will have almost no impact on the kernel 608# removing fingerprint methods will have almost no impact on the kernel
607# code size. 609# code size.
608# 610#
609#options VERIFIED_EXEC_FP_RMD160 611#options VERIFIED_EXEC_FP_RMD160
610#options VERIFIED_EXEC_FP_SHA256 612#options VERIFIED_EXEC_FP_SHA256
611#options VERIFIED_EXEC_FP_SHA384 613#options VERIFIED_EXEC_FP_SHA384
cvs diff -r1.104 -r1.104.2.1 src/sys/arch/sparc64/conf/GENERIC (expand / switch to unified diff)

--- src/sys/arch/sparc64/conf/GENERIC 2008/10/29 17:29:45 1.104
+++ src/sys/arch/sparc64/conf/GENERIC 2009/02/19 20:23:46 1.104.2.1
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: GENERIC,v 1.104 2008/10/29 17:29:45 jkunz Exp $ 1# $NetBSD: GENERIC,v 1.104.2.1 2009/02/19 20:23:46 snj Exp $
2# 2#
3# GENERIC machine description file 3# GENERIC machine description file
4# 4#
5# This machine description file is used to generate the default NetBSD 5# This machine description file is used to generate the default NetBSD
6# kernel. The generic kernel does not include all options, subsystems 6# kernel. The generic kernel does not include all options, subsystems
7# and device drivers, but should be useful for most applications. 7# and device drivers, but should be useful for most applications.
8# 8#
9# The machine description file can be customised for your specific 9# The machine description file can be customised for your specific
10# machine to reduce the kernel size and improve its performance. 10# machine to reduce the kernel size and improve its performance.
11# 11#
12# For further information on compiling NetBSD kernels, see the config(8) 12# For further information on compiling NetBSD kernels, see the config(8)
13# man page. 13# man page.
14# 14#
15# For further information on hardware support for this architecture, see 15# For further information on hardware support for this architecture, see
16# the intro(4) man page. For further information about kernel options 16# the intro(4) man page. For further information about kernel options
17# for this architecture, see the options(4) man page. For an explanation 17# for this architecture, see the options(4) man page. For an explanation
18# of each device driver in this file see the section 4 man page for the 18# of each device driver in this file see the section 4 man page for the
19# device. 19# device.
20 20
21include "arch/sparc64/conf/std.sparc64" 21include "arch/sparc64/conf/std.sparc64"
22 22
23options INCLUDE_CONFIG_FILE # embed config file in kernel binary 23options INCLUDE_CONFIG_FILE # embed config file in kernel binary
24 24
25#ident "GENERIC-$Revision: 1.104 $" 25#ident "GENERIC-$Revision: 1.104.2.1 $"
26 26
27maxusers 64 27maxusers 64
28 28
29## System kernel configuration. See options(4) for more detail. 29## System kernel configuration. See options(4) for more detail.
30 30
31 31
32# Options for variants of the Sun SPARC architecure. 32# Options for variants of the Sun SPARC architecure.
33# We currently support three architecture types; at least one is required. 33# We currently support three architecture types; at least one is required.
34options SUN4U # sun4u - UltraSPARC 34options SUN4U # sun4u - UltraSPARC
35#options BLINK # blink the system LED 35#options BLINK # blink the system LED
36 36
37#### System options that are the same for all ports 37#### System options that are the same for all ports
38 38
@@ -172,26 +172,27 @@ file-system OVERLAY # overlay file sys @@ -172,26 +172,27 @@ file-system OVERLAY # overlay file sys
172file-system MFS # memory-based filesystem 172file-system MFS # memory-based filesystem
173file-system FDESC # user file descriptor filesystem 173file-system FDESC # user file descriptor filesystem
174file-system UMAPFS # uid/gid remapping filesystem 174file-system UMAPFS # uid/gid remapping filesystem
175file-system LFS # Log-based filesystem (still experimental) 175file-system LFS # Log-based filesystem (still experimental)
176file-system PORTAL # portal filesystem (still experimental) 176file-system PORTAL # portal filesystem (still experimental)
177file-system PROCFS # /proc 177file-system PROCFS # /proc
178file-system CD9660 # ISO 9660 + Rock Ridge file system 178file-system CD9660 # ISO 9660 + Rock Ridge file system
179file-system UNION # union file system 179file-system UNION # union file system
180file-system MSDOSFS # MS-DOS FAT filesystem(s). 180file-system MSDOSFS # MS-DOS FAT filesystem(s).
181file-system PTYFS # /dev/pts/N support 181file-system PTYFS # /dev/pts/N support
182file-system SMBFS # experimental - CIFS; also needs nsmb (below) 182file-system SMBFS # experimental - CIFS; also needs nsmb (below)
183file-system TMPFS # Efficient memory file-system 183file-system TMPFS # Efficient memory file-system
184#file-system UDF # experimental - OSTA UDF CD/DVD file-system 184#file-system UDF # experimental - OSTA UDF CD/DVD file-system
 185file-system PUFFS # Userspace file systems (e.g. ntfs-3g & sshfs)
185 186
186## File system options. 187## File system options.
187options NFSSERVER # Sun NFS-compatible filesystem server 188options NFSSERVER # Sun NFS-compatible filesystem server
188options QUOTA # FFS quotas 189options QUOTA # FFS quotas
189#options FFS_EI # FFS Endian Independent support 190#options FFS_EI # FFS Endian Independent support
190options SOFTDEP # FFS soft updates support. 191options SOFTDEP # FFS soft updates support.
191options WAPBL # File system journaling support - Experimental 192options WAPBL # File system journaling support - Experimental
192#options FFS_NO_SNAPSHOT # No FFS snapshot support 193#options FFS_NO_SNAPSHOT # No FFS snapshot support
193 194
194## Network protocol support. In most environments, INET is required. 195## Network protocol support. In most environments, INET is required.
195options INET # IP (Internet Protocol) v4 196options INET # IP (Internet Protocol) v4
196options INET6 # IPV6 197options INET6 # IPV6
197#options IPSEC # IP security 198#options IPSEC # IP security
@@ -935,15 +936,18 @@ pseudo-device veriexec 1 @@ -935,15 +936,18 @@ pseudo-device veriexec 1
935options VERIFIED_EXEC_FP_RMD160 936options VERIFIED_EXEC_FP_RMD160
936options VERIFIED_EXEC_FP_SHA256 937options VERIFIED_EXEC_FP_SHA256
937options VERIFIED_EXEC_FP_SHA384 938options VERIFIED_EXEC_FP_SHA384
938options VERIFIED_EXEC_FP_SHA512 939options VERIFIED_EXEC_FP_SHA512
939options VERIFIED_EXEC_FP_SHA1 940options VERIFIED_EXEC_FP_SHA1
940options VERIFIED_EXEC_FP_MD5 941options VERIFIED_EXEC_FP_MD5
941 942
942# a pseudo device needed for SMBFS 943# a pseudo device needed for SMBFS
943pseudo-device nsmb # experimental - SMB requester 944pseudo-device nsmb # experimental - SMB requester
944 945
945# drvctl - needed to show device dictionary via drvctl(8) 946# drvctl - needed to show device dictionary via drvctl(8)
946pseudo-device drvctl 947pseudo-device drvctl
947 948
 949# Pass-to-Userspace TransporTER, required for puffs(4) and pud(4)
 950pseudo-device putter
 951
948#options PAX_MPROTECT=0 # PaX mprotect(2) restrictions 952#options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
949 # (for static binaries only for now) 953 # (for static binaries only for now)