Index: conf/GENERIC =================================================================== RCS file: /cvsroot/src/sys/arch/sun3/conf/GENERIC,v retrieving revision 1.172.10.1 diff -p -u -r1.172.10.1 GENERIC --- conf/GENERIC 26 Jan 2018 14:28:13 -0000 1.172.10.1 +++ conf/GENERIC 1 Mar 2018 20:24:21 -0000 @@ -47,7 +47,7 @@ options SYSVSHM # System V shared memo #options INSECURE # disable kernel security level #options USERCONF # userconf(4) support -#options PIPE_SOCKETPAIR # smaller, but slower pipe(2) +options PIPE_SOCKETPAIR # smaller, but slower pipe(2) options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel # Alternate buffer queue strategies for better responsiveness under high @@ -71,25 +71,25 @@ options DDB_HISTORY_SIZE=512 # enable h #options SCSIVERBOSE # Verbose SCSI errors # Compatibility options -options COMPAT_SUNOS # can run SunOS 4.1.1 executables +#options COMPAT_SUNOS # can run SunOS 4.1.1 executables #options COMPAT_SVR4 # can run SVR4 executables -options COMPAT_43 # and 4.3BSD and ... -options COMPAT_10 # NetBSD 1.0, -options COMPAT_11 # NetBSD 1.1, -options COMPAT_12 # NetBSD 1.2, -options COMPAT_13 # NetBSD 1.3, -options COMPAT_14 # NetBSD 1.4, -options COMPAT_15 # NetBSD 1.5, -options COMPAT_16 # NetBSD 1.6, -options COMPAT_20 # NetBSD 2.0, -options COMPAT_30 # NetBSD 3.0, -options COMPAT_40 # NetBSD 4.0, -options COMPAT_50 # NetBSD 5.0, -options COMPAT_60 # NetBSD 6.0, and -options COMPAT_70 # NetBSD 7.0 binary compatibility. -options COMPAT_AOUT_M68K # support for NetBSD a.out executables +#options COMPAT_43 # and 4.3BSD and ... +#options COMPAT_10 # NetBSD 1.0, +#options COMPAT_11 # NetBSD 1.1, +#options COMPAT_12 # NetBSD 1.2, +#options COMPAT_13 # NetBSD 1.3, +#options COMPAT_14 # NetBSD 1.4, +#options COMPAT_15 # NetBSD 1.5, +#options COMPAT_16 # NetBSD 1.6, +#options COMPAT_20 # NetBSD 2.0, +#options COMPAT_30 # NetBSD 3.0, +#options COMPAT_40 # NetBSD 4.0, +#options COMPAT_50 # NetBSD 5.0, +#options COMPAT_60 # NetBSD 6.0, and +#options COMPAT_70 # NetBSD 7.0 binary compatibility. +#options COMPAT_AOUT_M68K # support for NetBSD a.out executables #options COMPAT_LINUX # can run Linux/m68k executables -options EXEC_AOUT # support for a.out executables +#options EXEC_AOUT # support for a.out executables #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. @@ -97,29 +97,29 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p file-system FFS # Berkeley Fast Filesystem file-system NFS # Sun NFS client support file-system CD9660 # ISO 9660 + Rock Ridge file system -file-system FDESC # /dev/fd/* +#file-system FDESC # /dev/fd/* file-system KERNFS # /kern file-system NULLFS # loopback file system #file-system OVERLAY # overlay file system file-system PROCFS # /proc #file-system UNION # union file system -file-system MFS # memory-based filesystem +#file-system MFS # memory-based filesystem file-system PTYFS # /dev/pts/N support file-system TMPFS # Efficient memory file-system #file-system UDF # experimental - OSTA UDF CD/DVD file-system -options NFSSERVER # nfs server support +#options NFSSERVER # nfs server support #options QUOTA # legacy UFS quotas #options QUOTA2 # new, in-filesystem UFS quotas #options FFS_EI # FFS Endian Independent support -options WAPBL # File system journaling support +#options WAPBL # File system journaling support #options UFS_DIRHASH # UFS Large Directory Hashing - Experimental options FFS_NO_SNAPSHOT # No FFS snapshot support #options UFS_EXTATTR # Extended attribute support for UFS1 # Networking options options INET # IP protocol stack support -options INET6 # IPV6 +#options INET6 # IPV6 #options IPSEC # IP security #options IPSEC_DEBUG # debug for IP security #options GATEWAY # IP packet forwarding @@ -255,8 +255,8 @@ uk* at scsibus? target ? lun ? # unknow # # accept filters -pseudo-device accf_data # "dataready" accept filter -pseudo-device accf_http # "httpready" accept filter +#pseudo-device accf_data # "dataready" accept filter +#pseudo-device accf_http # "httpready" accept filter # Memory-disk drivers pseudo-device md Index: conf/Makefile.sun3 =================================================================== RCS file: /cvsroot/src/sys/arch/sun3/conf/Makefile.sun3,v retrieving revision 1.104 diff -p -u -r1.104 Makefile.sun3 --- conf/Makefile.sun3 15 Apr 2015 19:13:47 -0000 1.104 +++ conf/Makefile.sun3 1 Mar 2018 20:24:21 -0000 @@ -39,7 +39,12 @@ AFLAGS+= -x assembler-with-cpp ## ## (3) libkern and compat ## -KERN_AS= obj +OPT_MODULAR= %MODULAR% +.if !empty(OPT_MODULAR) +KERN_AS= obj +.else +KERN_AS= library +.endif ## ## (4) local objects, compile rules, and dependencies