Module Name: src Committed By: maxv Date: Sun Jul 30 13:12:49 UTC 2017
Modified Files: src/sys/arch/amiga/conf: DRACO GENERIC GENERIC.in src/sys/arch/sparc/conf: GENERIC KRUPS MRCOFFEE TADPOLE3GX src/sys/arch/sparc64/conf: GENERIC NONPLUS64 Log Message: Disable svr4 and svr4_32 on sparc, sparc64 and amiga - the only places where they were still enabled. To generate a diff of this commit: cvs rdiff -u -r1.181 -r1.182 src/sys/arch/amiga/conf/DRACO cvs rdiff -u -r1.315 -r1.316 src/sys/arch/amiga/conf/GENERIC cvs rdiff -u -r1.133 -r1.134 src/sys/arch/amiga/conf/GENERIC.in cvs rdiff -u -r1.253 -r1.254 src/sys/arch/sparc/conf/GENERIC cvs rdiff -u -r1.72 -r1.73 src/sys/arch/sparc/conf/KRUPS cvs rdiff -u -r1.51 -r1.52 src/sys/arch/sparc/conf/MRCOFFEE cvs rdiff -u -r1.71 -r1.72 src/sys/arch/sparc/conf/TADPOLE3GX cvs rdiff -u -r1.199 -r1.200 src/sys/arch/sparc64/conf/GENERIC cvs rdiff -u -r1.51 -r1.52 src/sys/arch/sparc64/conf/NONPLUS64 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/amiga/conf/DRACO diff -u src/sys/arch/amiga/conf/DRACO:1.181 src/sys/arch/amiga/conf/DRACO:1.182 --- src/sys/arch/amiga/conf/DRACO:1.181 Fri Jul 28 19:26:15 2017 +++ src/sys/arch/amiga/conf/DRACO Sun Jul 30 13:12:49 2017 @@ -1,4 +1,4 @@ -# $NetBSD: DRACO,v 1.181 2017/07/28 19:26:15 maxv Exp $ +# $NetBSD: DRACO,v 1.182 2017/07/30 13:12:49 maxv Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. @@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.181 $" +#ident "GENERIC-$Revision: 1.182 $" makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk @@ -140,7 +140,7 @@ options COMPAT_50 # NetBSD 5.0, options COMPAT_60 # NetBSD 6.0, and options COMPAT_70 # NetBSD 7.0 binary compatibility. options COMPAT_SUNOS # Support to run Sun (m68k) executables -options COMPAT_SVR4 # Support to run SVR4 (m68k) executables +#options COMPAT_SVR4 # Support to run SVR4 (m68k) executables options COMPAT_NOMID # allow nonvalid machine id executables #options COMPAT_LINUX # Support to run Linux/m68k executables Index: src/sys/arch/amiga/conf/GENERIC diff -u src/sys/arch/amiga/conf/GENERIC:1.315 src/sys/arch/amiga/conf/GENERIC:1.316 --- src/sys/arch/amiga/conf/GENERIC:1.315 Fri Jul 28 19:26:15 2017 +++ src/sys/arch/amiga/conf/GENERIC Sun Jul 30 13:12:49 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.315 2017/07/28 19:26:15 maxv Exp $ +# $NetBSD: GENERIC,v 1.316 2017/07/30 13:12:49 maxv Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. @@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.315 $" +#ident "GENERIC-$Revision: 1.316 $" makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk @@ -153,7 +153,7 @@ options COMPAT_50 # NetBSD 5.0, options COMPAT_60 # NetBSD 6.0, and options COMPAT_70 # NetBSD 7.0 binary compatibility. options COMPAT_SUNOS # Support to run Sun (m68k) executables -options COMPAT_SVR4 # Support to run SVR4 (m68k) executables +#options COMPAT_SVR4 # Support to run SVR4 (m68k) executables options COMPAT_NOMID # allow nonvalid machine id executables #options COMPAT_LINUX # Support to run Linux/m68k executables Index: src/sys/arch/amiga/conf/GENERIC.in diff -u src/sys/arch/amiga/conf/GENERIC.in:1.133 src/sys/arch/amiga/conf/GENERIC.in:1.134 --- src/sys/arch/amiga/conf/GENERIC.in:1.133 Fri Jul 28 19:26:15 2017 +++ src/sys/arch/amiga/conf/GENERIC.in Sun Jul 30 13:12:49 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC.in,v 1.133 2017/07/28 19:26:15 maxv Exp $ +# $NetBSD: GENERIC.in,v 1.134 2017/07/30 13:12:49 maxv Exp $ # ## # GENERIC machine description file @@ -52,7 +52,7 @@ include "arch/amiga/conf/std.amiga" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.133 $" +#ident "GENERIC-$Revision: 1.134 $" m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl makeoptions COPTS="-Os" @@ -195,7 +195,7 @@ options COMPAT_50 # NetBSD 5.0, options COMPAT_60 # NetBSD 6.0, and options COMPAT_70 # NetBSD 7.0 binary compatibility. options COMPAT_SUNOS # Support to run Sun (m68k) executables -options COMPAT_SVR4 # Support to run SVR4 (m68k) executables +#options COMPAT_SVR4 # Support to run SVR4 (m68k) executables options COMPAT_NOMID # allow nonvalid machine id executables #options COMPAT_LINUX # Support to run Linux/m68k executables ')m4_dnl Index: src/sys/arch/sparc/conf/GENERIC diff -u src/sys/arch/sparc/conf/GENERIC:1.253 src/sys/arch/sparc/conf/GENERIC:1.254 --- src/sys/arch/sparc/conf/GENERIC:1.253 Sat Dec 10 09:44:06 2016 +++ src/sys/arch/sparc/conf/GENERIC Sun Jul 30 13:12:49 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.253 2016/12/10 09:44:06 mrg Exp $ +# $NetBSD: GENERIC,v 1.254 2017/07/30 13:12:49 maxv Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/sparc/conf/std.sparc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.253 $" +#ident "GENERIC-$Revision: 1.254 $" maxusers 32 @@ -172,7 +172,7 @@ options COMPAT_50 # NetBSD 5.0, options COMPAT_60 # NetBSD 6.0, and options COMPAT_70 # NetBSD 7.0 binary compatibility options COMPAT_SUNOS # SunOS 4.x binary compatibility -options COMPAT_SVR4 # SunOS 5.x binary compatibility +#options COMPAT_SVR4 # SunOS 5.x binary compatibility options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. ## File systems. You probably need at least one of FFS or NFS. Index: src/sys/arch/sparc/conf/KRUPS diff -u src/sys/arch/sparc/conf/KRUPS:1.72 src/sys/arch/sparc/conf/KRUPS:1.73 --- src/sys/arch/sparc/conf/KRUPS:1.72 Tue Dec 13 20:42:20 2016 +++ src/sys/arch/sparc/conf/KRUPS Sun Jul 30 13:12:49 2017 @@ -1,4 +1,4 @@ -# $NetBSD: KRUPS,v 1.72 2016/12/13 20:42:20 christos Exp $ +# $NetBSD: KRUPS,v 1.73 2017/07/30 13:12:49 maxv 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.72 $" +#ident "KRUPS-$Revision: 1.73 $" maxusers 32 @@ -176,7 +176,7 @@ options COMPAT_20 # NetBSD 2.0, options COMPAT_30 # NetBSD 3.0, and options COMPAT_40 # NetBSD 4.0 binary compatibility. options COMPAT_SUNOS # SunOS 4.x binary compatibility -options COMPAT_SVR4 # SunOS 5.x binary compatibility +#options COMPAT_SVR4 # SunOS 5.x binary compatibility options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. ## File systems. You probably need at least one of FFS or NFS. Index: src/sys/arch/sparc/conf/MRCOFFEE diff -u src/sys/arch/sparc/conf/MRCOFFEE:1.51 src/sys/arch/sparc/conf/MRCOFFEE:1.52 --- src/sys/arch/sparc/conf/MRCOFFEE:1.51 Tue Dec 13 20:42:20 2016 +++ src/sys/arch/sparc/conf/MRCOFFEE Sun Jul 30 13:12:49 2017 @@ -1,4 +1,4 @@ -# $NetBSD: MRCOFFEE,v 1.51 2016/12/13 20:42:20 christos Exp $ +# $NetBSD: MRCOFFEE,v 1.52 2017/07/30 13:12:49 maxv Exp $ # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp # # Mr.Coffee (JavaStation 1) machine description file @@ -12,7 +12,7 @@ include "arch/sparc/conf/std.sparc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "MRCOFFEE-$Revision: 1.51 $" +#ident "MRCOFFEE-$Revision: 1.52 $" maxusers 32 @@ -160,7 +160,7 @@ options COMPAT_50 # NetBSD 5.0, options COMPAT_60 # NetBSD 6.0, and options COMPAT_70 # NetBSD 7.0 binary compatibility. options COMPAT_SUNOS # SunOS 4.x binary compatibility -options COMPAT_SVR4 # SunOS 5.x binary compatibility +#options COMPAT_SVR4 # SunOS 5.x binary compatibility options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. ## File systems. You probably need at least one of FFS or NFS. Index: src/sys/arch/sparc/conf/TADPOLE3GX diff -u src/sys/arch/sparc/conf/TADPOLE3GX:1.71 src/sys/arch/sparc/conf/TADPOLE3GX:1.72 --- src/sys/arch/sparc/conf/TADPOLE3GX:1.71 Sat Jul 29 18:08:59 2017 +++ src/sys/arch/sparc/conf/TADPOLE3GX Sun Jul 30 13:12:49 2017 @@ -1,4 +1,4 @@ -# $NetBSD: TADPOLE3GX,v 1.71 2017/07/29 18:08:59 maxv Exp $ +# $NetBSD: TADPOLE3GX,v 1.72 2017/07/30 13:12:49 maxv Exp $ include "arch/sparc/conf/std.sparc" @@ -142,7 +142,7 @@ options COMPAT_50 # NetBSD 5.0, options COMPAT_60 # NetBSD 6.0, and options COMPAT_70 # NetBSD 7.0 binary compatibility. options COMPAT_SUNOS # SunOS 4.x binary compatibility -options COMPAT_SVR4 # SunOS 5.x binary compatibility +#options COMPAT_SVR4 # SunOS 5.x binary compatibility options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. ## File systems. You probably need at least one of FFS or NFS. Index: src/sys/arch/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.199 src/sys/arch/sparc64/conf/GENERIC:1.200 --- src/sys/arch/sparc64/conf/GENERIC:1.199 Sat Jul 29 18:08:59 2017 +++ src/sys/arch/sparc64/conf/GENERIC Sun Jul 30 13:12:49 2017 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.199 2017/07/29 18:08:59 maxv Exp $ +# $NetBSD: GENERIC,v 1.200 2017/07/30 13:12:49 maxv Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.199 $" +#ident "GENERIC-$Revision: 1.200 $" maxusers 64 @@ -149,8 +149,8 @@ options COMPAT_50 # NetBSD 5.0, options COMPAT_60 # NetBSD 6.0, and options COMPAT_70 # NetBSD 7.0 binary compatibility. options COMPAT_SUNOS # SunOS 4.x binary compatibility -options COMPAT_SVR4 # SunOS 5.x binary compatibility -options COMPAT_SVR4_32 # SunOS 5.x 32-bit binary compatibility -- 64-bit only +#options COMPAT_SVR4 # SunOS 5.x binary compatibility +#options COMPAT_SVR4_32 # SunOS 5.x 32-bit binary compatibility -- 64-bit only options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility -- 64-bit only options EXEC_AOUT # execve(2) support for a.out binaries options EXEC_ELF32 # Exec module for SunOS 5.x binaries. Index: src/sys/arch/sparc64/conf/NONPLUS64 diff -u src/sys/arch/sparc64/conf/NONPLUS64:1.51 src/sys/arch/sparc64/conf/NONPLUS64:1.52 --- src/sys/arch/sparc64/conf/NONPLUS64:1.51 Sat Jul 29 18:08:59 2017 +++ src/sys/arch/sparc64/conf/NONPLUS64 Sun Jul 30 13:12:49 2017 @@ -1,8 +1,8 @@ -# $NetBSD: NONPLUS64,v 1.51 2017/07/29 18:08:59 maxv Exp $ +# $NetBSD: NONPLUS64,v 1.52 2017/07/30 13:12:49 maxv Exp $ include "arch/sparc64/conf/std.sparc64" -#ident "NONPLUS64-$Revision: 1.51 $" +#ident "NONPLUS64-$Revision: 1.52 $" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary @@ -115,8 +115,8 @@ options COMPAT_20 # NetBSD 2.0, options COMPAT_30 # NetBSD 3.0, and options COMPAT_40 # NetBSD 4.0 binary compatibility. options COMPAT_SUNOS # SunOS 4.x binary compatibility -options COMPAT_SVR4 # SunOS 5.x binary compatibility -options COMPAT_SVR4_32 # 32-bit SVR4 binaries +#options COMPAT_SVR4 # SunOS 5.x binary compatibility +#options COMPAT_SVR4_32 # 32-bit SVR4 binaries options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility options EXEC_ELF32 # Exec module for NetBSD/sparc 1.5 binaries. #options SYSCALL_DEBUG