Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/i386/conf Set valid values for the (commented out) ...



details:   https://anonhg.NetBSD.org/src/rev/6d290d911f42
branches:  trunk
changeset: 569825:6d290d911f42
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Wed Sep 08 11:38:22 2004 +0000

description:
Set valid values for the (commented out) WS_DEFAULT_COLATTR and
WS_DEFAULT_MONOATTR options.  This way, if a user blindly uncomments
them, he will not get a build failure.  Addresses PR kern/26503.

diffstat:

 sys/arch/i386/conf/DELPHI         |  8 ++++----
 sys/arch/i386/conf/GENERIC        |  8 ++++----
 sys/arch/i386/conf/GENERIC_LAPTOP |  8 ++++----
 sys/arch/i386/conf/GENERIC_TINY   |  6 +++---
 sys/arch/i386/conf/INSTALL        |  6 +++---
 sys/arch/i386/conf/INSTALL_LAPTOP |  6 +++---
 sys/arch/i386/conf/IOPENER        |  8 ++++----
 sys/arch/i386/conf/LAMB           |  6 +++---
 sys/arch/i386/conf/SWINGER        |  8 ++++----
 sys/arch/i386/conf/VIRTUALPC      |  8 ++++----
 10 files changed, 36 insertions(+), 36 deletions(-)

diffs (254 lines):

diff -r 3bb241eb3269 -r 6d290d911f42 sys/arch/i386/conf/DELPHI
--- a/sys/arch/i386/conf/DELPHI Wed Sep 08 10:52:56 2004 +0000
+++ b/sys/arch/i386/conf/DELPHI Wed Sep 08 11:38:22 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: DELPHI,v 1.40 2004/09/04 23:29:48 manu Exp $
+#      $NetBSD: DELPHI,v 1.41 2004/09/08 11:38:22 jmmv Exp $
 #
 #      DELPHI -- one of thorpej%zembu.com@localhost's devel machines
 #
@@ -7,7 +7,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-ident          "DELPHI-$Revision: 1.40 $"
+ident          "DELPHI-$Revision: 1.41 $"
 
 maxusers       64              # estimated number of users
 
@@ -165,8 +165,8 @@
 #options       WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
 #options       WS_DEFAULT_FG=WSCOL_WHITE
 #options       WS_DEFAULT_BG=WSCOL_BLACK
-#options       WS_DEFAULT_COLATTR=""
-#options       WS_DEFAULT_MONOATTR=""
+#options       WS_DEFAULT_COLATTR="(0)"
+#options       WS_DEFAULT_MONOATTR="(0)"
 options        WS_KERNEL_FG=WSCOL_GREEN
 #options       WS_KERNEL_BG=WSCOL_BLACK
 #options       WS_KERNEL_COLATTR=""
diff -r 3bb241eb3269 -r 6d290d911f42 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Wed Sep 08 10:52:56 2004 +0000
+++ b/sys/arch/i386/conf/GENERIC        Wed Sep 08 11:38:22 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.630 2004/09/04 23:29:48 manu Exp $
+# $NetBSD: GENERIC,v 1.631 2004/09/08 11:38:22 jmmv Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.630 $"
+#ident                 "GENERIC-$Revision: 1.631 $"
 
 maxusers       32              # estimated number of users
 
@@ -231,8 +231,8 @@
 options        WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
 #options       WS_DEFAULT_FG=WSCOL_WHITE
 #options       WS_DEFAULT_BG=WSCOL_BLACK
-#options       WS_DEFAULT_COLATTR=""
-#options       WS_DEFAULT_MONOATTR=""
+#options       WS_DEFAULT_COLATTR="(0)"
+#options       WS_DEFAULT_MONOATTR="(0)"
 options        WS_KERNEL_FG=WSCOL_GREEN
 #options       WS_KERNEL_BG=WSCOL_BLACK
 #options       WS_KERNEL_COLATTR=""
diff -r 3bb241eb3269 -r 6d290d911f42 sys/arch/i386/conf/GENERIC_LAPTOP
--- a/sys/arch/i386/conf/GENERIC_LAPTOP Wed Sep 08 10:52:56 2004 +0000
+++ b/sys/arch/i386/conf/GENERIC_LAPTOP Wed Sep 08 11:38:22 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC_LAPTOP,v 1.115 2004/09/04 23:29:48 manu Exp $
+#      $NetBSD: GENERIC_LAPTOP,v 1.116 2004/09/08 11:38:23 jmmv Exp $
 #      From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp
 #
 #      GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled
@@ -8,7 +8,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.115 $"
+#ident                 "GENERIC-$Revision: 1.116 $"
 
 maxusers       32              # estimated number of users
 
@@ -195,8 +195,8 @@
 options        WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
 #options       WS_DEFAULT_FG=WSCOL_WHITE
 #options       WS_DEFAULT_BG=WSCOL_BLACK
-#options       WS_DEFAULT_COLATTR=""
-#options       WS_DEFAULT_MONOATTR=""
+#options       WS_DEFAULT_COLATTR="(0)"
+#options       WS_DEFAULT_MONOATTR="(0)"
 options        WS_KERNEL_FG=WSCOL_GREEN
 #options       WS_KERNEL_BG=WSCOL_BLACK
 #options       WS_KERNEL_COLATTR=""
diff -r 3bb241eb3269 -r 6d290d911f42 sys/arch/i386/conf/GENERIC_TINY
--- a/sys/arch/i386/conf/GENERIC_TINY   Wed Sep 08 10:52:56 2004 +0000
+++ b/sys/arch/i386/conf/GENERIC_TINY   Wed Sep 08 11:38:22 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC_TINY,v 1.73 2004/09/04 23:29:49 manu Exp $
+#      $NetBSD: GENERIC_TINY,v 1.74 2004/09/08 11:38:24 jmmv Exp $
 #
 #      GENERIC_TINY -- suitable default for 4M machines
 #                      No EISA, PCI, or SCSI.
@@ -175,8 +175,8 @@
 #options       WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
 #options       WS_DEFAULT_FG=WSCOL_WHITE
 #options       WS_DEFAULT_BG=WSCOL_BLACK
-#options       WS_DEFAULT_COLATTR=""
-#options       WS_DEFAULT_MONOATTR=""
+#options       WS_DEFAULT_COLATTR="(0)"
+#options       WS_DEFAULT_MONOATTR="(0)"
 options        WS_KERNEL_FG=WSCOL_GREEN
 #options       WS_KERNEL_BG=WSCOL_BLACK
 #options       WS_KERNEL_COLATTR=""
diff -r 3bb241eb3269 -r 6d290d911f42 sys/arch/i386/conf/INSTALL
--- a/sys/arch/i386/conf/INSTALL        Wed Sep 08 10:52:56 2004 +0000
+++ b/sys/arch/i386/conf/INSTALL        Wed Sep 08 11:38:22 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL,v 1.250 2004/09/04 23:29:49 manu Exp $
+#      $NetBSD: INSTALL,v 1.251 2004/09/08 11:38:24 jmmv Exp $
 #
 #      INSTALL - Installation kernel.
 #
@@ -163,8 +163,8 @@
 #options       WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
 #options       WS_DEFAULT_FG=WSCOL_WHITE
 #options       WS_DEFAULT_BG=WSCOL_BLACK
-#options       WS_DEFAULT_COLATTR=""
-#options       WS_DEFAULT_MONOATTR=""
+#options       WS_DEFAULT_COLATTR="(0)"
+#options       WS_DEFAULT_MONOATTR="(0)"
 #options       WS_KERNEL_FG=WSCOL_GREEN
 #options       WS_KERNEL_BG=WSCOL_BLACK
 #options       WS_KERNEL_COLATTR=""
diff -r 3bb241eb3269 -r 6d290d911f42 sys/arch/i386/conf/INSTALL_LAPTOP
--- a/sys/arch/i386/conf/INSTALL_LAPTOP Wed Sep 08 10:52:56 2004 +0000
+++ b/sys/arch/i386/conf/INSTALL_LAPTOP Wed Sep 08 11:38:22 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL_LAPTOP,v 1.70 2004/09/04 23:29:49 manu Exp $
+#      $NetBSD: INSTALL_LAPTOP,v 1.71 2004/09/08 11:38:25 jmmv Exp $
 #
 #      INSTALL - Installation kernel.
 #
@@ -161,8 +161,8 @@
 #options       WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
 #options       WS_DEFAULT_FG=WSCOL_WHITE
 #options       WS_DEFAULT_BG=WSCOL_BLACK
-#options       WS_DEFAULT_COLATTR=""
-#options       WS_DEFAULT_MONOATTR=""
+#options       WS_DEFAULT_COLATTR="(0)"
+#options       WS_DEFAULT_MONOATTR="(0)"
 #options       WS_KERNEL_FG=WSCOL_GREEN
 #options       WS_KERNEL_BG=WSCOL_BLACK
 #options       WS_KERNEL_COLATTR=""
diff -r 3bb241eb3269 -r 6d290d911f42 sys/arch/i386/conf/IOPENER
--- a/sys/arch/i386/conf/IOPENER        Wed Sep 08 10:52:56 2004 +0000
+++ b/sys/arch/i386/conf/IOPENER        Wed Sep 08 11:38:22 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: IOPENER,v 1.49 2004/09/04 23:29:49 manu Exp $
+#      $NetBSD: IOPENER,v 1.50 2004/09/08 11:38:25 jmmv Exp $
 #
 #      IOPENER -- GENERIC-like kernel for the Netpliance i-opener
 #      from: GENERIC,v 1.358 2000/07/05 04:07:25 sommerfeld Exp
@@ -8,7 +8,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "IOPENER-$Revision: 1.49 $"
+#ident                 "IOPENER-$Revision: 1.50 $"
 
 maxusers       32              # estimated number of users
 
@@ -148,8 +148,8 @@
 options        WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
 #options       WS_DEFAULT_FG=WSCOL_WHITE
 #options       WS_DEFAULT_BG=WSCOL_BLACK
-#options       WS_DEFAULT_COLATTR=""
-#options       WS_DEFAULT_MONOATTR=""
+#options       WS_DEFAULT_COLATTR="(0)"
+#options       WS_DEFAULT_MONOATTR="(0)"
 options        WS_KERNEL_FG=WSCOL_GREEN
 #options       WS_KERNEL_BG=WSCOL_BLACK
 #options       WS_KERNEL_COLATTR=""
diff -r 3bb241eb3269 -r 6d290d911f42 sys/arch/i386/conf/LAMB
--- a/sys/arch/i386/conf/LAMB   Wed Sep 08 10:52:56 2004 +0000
+++ b/sys/arch/i386/conf/LAMB   Wed Sep 08 11:38:22 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: LAMB,v 1.40 2004/09/04 23:29:49 manu Exp $
+#      $NetBSD: LAMB,v 1.41 2004/09/08 11:38:25 jmmv Exp $
 #
 #      LAMB - a complete kernel for wildlab LAMB, http://www.wildlab.com/
 #
@@ -169,8 +169,8 @@
 options        WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
 #options       WS_DEFAULT_FG=WSCOL_WHITE
 #options       WS_DEFAULT_BG=WSCOL_BLACK
-#options       WS_DEFAULT_COLATTR=""
-#options       WS_DEFAULT_MONOATTR=""
+#options       WS_DEFAULT_COLATTR="(0)"
+#options       WS_DEFAULT_MONOATTR="(0)"
 options        WS_KERNEL_FG=WSCOL_GREEN
 #options       WS_KERNEL_BG=WSCOL_BLACK
 #options       WS_KERNEL_COLATTR=""
diff -r 3bb241eb3269 -r 6d290d911f42 sys/arch/i386/conf/SWINGER
--- a/sys/arch/i386/conf/SWINGER        Wed Sep 08 10:52:56 2004 +0000
+++ b/sys/arch/i386/conf/SWINGER        Wed Sep 08 11:38:22 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: SWINGER,v 1.53 2004/09/04 23:29:50 manu Exp $
+#      $NetBSD: SWINGER,v 1.54 2004/09/08 11:38:25 jmmv Exp $
 #      from NetBSD: GENERIC,v 1.325 2000/04/14 14:53:32 augustss Exp
 #
 #      SWINGER -- thorpej's Abit BP6+dual Celeron
@@ -8,7 +8,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "SWINGER-$Revision: 1.53 $"
+#ident                 "SWINGER-$Revision: 1.54 $"
 
 maxusers       64              # estimated number of users
 
@@ -161,8 +161,8 @@
 #options       WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
 #options       WS_DEFAULT_FG=WSCOL_WHITE
 #options       WS_DEFAULT_BG=WSCOL_BLACK
-#options       WS_DEFAULT_COLATTR=""
-#options       WS_DEFAULT_MONOATTR=""
+#options       WS_DEFAULT_COLATTR="(0)"
+#options       WS_DEFAULT_MONOATTR="(0)"
 options        WS_KERNEL_FG=WSCOL_GREEN
 #options       WS_KERNEL_BG=WSCOL_BLACK
 #options       WS_KERNEL_COLATTR=""
diff -r 3bb241eb3269 -r 6d290d911f42 sys/arch/i386/conf/VIRTUALPC
--- a/sys/arch/i386/conf/VIRTUALPC      Wed Sep 08 10:52:56 2004 +0000
+++ b/sys/arch/i386/conf/VIRTUALPC      Wed Sep 08 11:38:22 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: VIRTUALPC,v 1.10 2004/09/04 23:29:50 manu Exp $
+# $NetBSD: VIRTUALPC,v 1.11 2004/09/08 11:38:25 jmmv Exp $
 #
 # VIRTUALPC machine description file --
 #
@@ -11,7 +11,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "VIRTUALPC-$Revision: 1.10 $"
+#ident                 "VIRTUALPC-$Revision: 1.11 $"
 
 maxusers       32              # estimated number of users
 
@@ -203,8 +203,8 @@
 options        WSDISPLAY_CUSTOM_OUTPUT # color customization from wsconsctl(8)
 #options       WS_DEFAULT_FG=WSCOL_WHITE
 #options       WS_DEFAULT_BG=WSCOL_BLACK
-#options       WS_DEFAULT_COLATTR=""
-#options       WS_DEFAULT_MONOATTR=""
+#options       WS_DEFAULT_COLATTR="(0)"
+#options       WS_DEFAULT_MONOATTR="(0)"
 options        WS_KERNEL_FG=WSCOL_GREEN
 #options       WS_KERNEL_BG=WSCOL_BLACK
 #options       WS_KERNEL_COLATTR=""



Home | Main Index | Thread Index | Old Index