From bf276019318f12d86b7929a954e1e0f277c6aecb Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Sat, 13 Apr 2002 02:34:17 +0000
Subject: [PATCH] * Fix the kernel set selection. * Default X sets to "no".

---
 distrib/utils/sysinst/arch/evbarm/md.c        |  8 ++--
 distrib/utils/sysinst/arch/evbarm/md.h        | 37 ++++++++++---------
 distrib/utils/sysinst/arch/evbarm/menus.md.en | 33 +++++++++--------
 distrib/utils/sysinst/arch/evbarm/menus.md.fr | 33 +++++++++--------
 distrib/utils/sysinst/arch/evbarm/menus.md.pl | 33 +++++++++--------
 5 files changed, 78 insertions(+), 66 deletions(-)

diff --git a/distrib/utils/sysinst/arch/evbarm/md.c b/distrib/utils/sysinst/arch/evbarm/md.c
index 56282c884b1c..44f2b894903e 100644
--- a/distrib/utils/sysinst/arch/evbarm/md.c
+++ b/distrib/utils/sysinst/arch/evbarm/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.1 2002/04/13 01:47:53 thorpej Exp $	*/
+/*	$NetBSD: md.c,v 1.2 2002/04/13 02:34:17 thorpej Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -360,10 +360,10 @@ void
 md_set_no_x()
 {
 
-	toggle_getit (8);
-	toggle_getit (9);
-	toggle_getit (10);
 	toggle_getit (11);
 	toggle_getit (12);
 	toggle_getit (13);
+	toggle_getit (14);
+	toggle_getit (15);
+	toggle_getit (16);
 }
diff --git a/distrib/utils/sysinst/arch/evbarm/md.h b/distrib/utils/sysinst/arch/evbarm/md.h
index d938ce38dac9..f1d15eee7b6b 100644
--- a/distrib/utils/sysinst/arch/evbarm/md.h
+++ b/distrib/utils/sysinst/arch/evbarm/md.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.h,v 1.1 2002/04/13 01:47:53 thorpej Exp $	*/
+/*	$NetBSD: md.h,v 1.2 2002/04/13 02:34:18 thorpej Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -37,7 +37,7 @@
  *
  */
 
-/* md.h -- Machine specific definitions for the shark */
+/* md.h -- Machine specific definitions for evbarm */
 
 /* Constants and defines */
 
@@ -56,21 +56,24 @@
 EXTERN distinfo dist_list[]
 #ifdef MAIN
 = {
-    {"kern-GENERIC",	1, NULL, "Kernel       : "},
-    {"base",		1, NULL, "Base         : "},
-    {"etc",		1, NULL, "System (/etc): "},
-    {"comp",		1, NULL, "Compiler     : "},
-    {"games",		1, NULL, "Games        : "},
-    {"man",		1, NULL, "Manuals      : "},
-    {"misc",		1, NULL, "Miscellaneous: "},
-    {"text",		1, NULL, "Text tools   : "},
+    {"kern-INTEGRATOR",		0, NULL, "Kernel       : "},
+    {"kern-IQ80310",		0, NULL, "Kernel       : "},
+    {"kern-IQ80321",		0, NULL, "Kernel       : "},
+    {"kern-TEAMASA_NPWR",	0, NULL, "Kernel       : "},
+    {"base",			1, NULL, "Base         : "},
+    {"etc",			1, NULL, "System (/etc): "},
+    {"comp",			1, NULL, "Compiler     : "},
+    {"games",			1, NULL, "Games        : "},
+    {"man",			1, NULL, "Manuals      : "},
+    {"misc",			1, NULL, "Miscellaneous: "},
+    {"text",			1, NULL, "Text tools   : "},
 
-    {"xbase",		1, NULL, "X11 clients  : "},
-    {"xfont",		1, NULL, "X11 fonts    : "},
-    {"xserver",		1, NULL, "X11 servers  : "},
-    {"xcontrib",	1, NULL, "X11 contrib  : "},
-    {"xcomp",		1, NULL, "X programming: "},
-    {"xmisc",		1, NULL, "X11 Misc.    : "},
+    {"xbase",			0, NULL, "X11 clients  : "},
+    {"xfont",			0, NULL, "X11 fonts    : "},
+    {"xserver",			0, NULL, "X11 servers  : "},
+    {"xcontrib",		0, NULL, "X11 contrib  : "},
+    {"xcomp",			0, NULL, "X programming: "},
+    {"xmisc",			0, NULL, "X11 Misc.    : "},
     {NULL, 0, NULL, NULL }
 }
 #endif
@@ -108,7 +111,7 @@ EXTERN	char *disk_names[]
 
 /*
  * Default fileystem type for floppy disks.
- * On shark, that is msdos.
+ * On evbarm, that is msdos.
  */
 EXTERN char *fdtype INIT("msdos");
 
diff --git a/distrib/utils/sysinst/arch/evbarm/menus.md.en b/distrib/utils/sysinst/arch/evbarm/menus.md.en
index c9f0f08bb016..fee63cc83405 100644
--- a/distrib/utils/sysinst/arch/evbarm/menus.md.en
+++ b/distrib/utils/sysinst/arch/evbarm/menus.md.en
@@ -1,4 +1,4 @@
-/*	$NetBSD: menus.md.en,v 1.1 2002/04/13 01:47:54 thorpej Exp $	*/
+/*	$NetBSD: menus.md.en,v 1.2 2002/04/13 02:34:18 thorpej Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -57,17 +57,20 @@ menu editfsparts, y=12, exit;
  
 menu md_distcustom, x=26, y=5, exit, title "Selection toggles inclusion";
 	display action { show_cur_distsets (); };
-	option	"Kernel (GENERIC)",	 action { toggle_getit (0); };
-	option	"Base",			 action { toggle_getit (1); };
-	option	"System (/etc)",	 action { toggle_getit (2); };
-	option  "Compiler Tools", 	 action { toggle_getit (3); };
-	option  "Games", 		 action { toggle_getit (4); };
-	option  "Online Manual Pages", 	 action { toggle_getit (5); };
-	option  "Miscellaneous", 	 action { toggle_getit (6); };
-	option  "Text Processing Tools", action { toggle_getit (7); };
-	option  "X11 base and clients",	 action { toggle_getit (8); };
-	option  "X11 fonts",		 action { toggle_getit (9); };
-	option  "X11 servers",		 action { toggle_getit (10); };
-	option  "X contrib clients",	 action { toggle_getit (11); };
-	option  "X11 programming",	 action { toggle_getit (12); };
-	option  "X11 Misc.",		 action { toggle_getit (13); };
+	option	"Kernel (INTEGRATOR)",	 action { toggle_getit (0); };
+	option	"Kernel (IQ80310)",	 action { toggle_getit (1); };
+	option	"Kernel (IQ80321)",	 action { toggle_getit (2); };
+	option	"Kernel (TEAMASA_NPWR)", action { toggle_getit (3); };
+	option	"Base",			 action { toggle_getit (4); };
+	option	"System (/etc)",	 action { toggle_getit (5); };
+	option  "Compiler Tools", 	 action { toggle_getit (6); };
+	option  "Games", 		 action { toggle_getit (7); };
+	option  "Online Manual Pages", 	 action { toggle_getit (8); };
+	option  "Miscellaneous", 	 action { toggle_getit (9); };
+	option  "Text Processing Tools", action { toggle_getit (10); };
+	option  "X11 base and clients",	 action { toggle_getit (11); };
+	option  "X11 fonts",		 action { toggle_getit (12); };
+	option  "X11 servers",		 action { toggle_getit (13); };
+	option  "X contrib clients",	 action { toggle_getit (14); };
+	option  "X11 programming",	 action { toggle_getit (15); };
+	option  "X11 Misc.",		 action { toggle_getit (16); };
diff --git a/distrib/utils/sysinst/arch/evbarm/menus.md.fr b/distrib/utils/sysinst/arch/evbarm/menus.md.fr
index e5cb92f102a5..ec203cc12de9 100644
--- a/distrib/utils/sysinst/arch/evbarm/menus.md.fr
+++ b/distrib/utils/sysinst/arch/evbarm/menus.md.fr
@@ -1,4 +1,4 @@
-/*	$NetBSD: menus.md.fr,v 1.1 2002/04/13 01:47:55 thorpej Exp $	*/
+/*	$NetBSD: menus.md.fr,v 1.2 2002/04/13 02:34:18 thorpej Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -57,17 +57,20 @@ menu editfsparts, y=12, exit;
  
 menu md_distcustom, x=26, y=5, exit, title "Sélection des composants";
 	display action { show_cur_distsets (); };
-	option	"Kernel (GENERIC)",	 action { toggle_getit (0); };
-	option	"Base",			 action { toggle_getit (1); };
-	option	"System (/etc)",	 action { toggle_getit (2); };
-	option  "Outils de développement", 	 action { toggle_getit (3); };
-	option  "Jeux", 		 action { toggle_getit (4); };
-	option  "Pages de manuel", 	 action { toggle_getit (5); };
-	option  "Divers", 	 action { toggle_getit (6); };
-	option  "Outils de manipulation de textes", action { toggle_getit (7); };
-	option  "X11 base et clients",	 action { toggle_getit (8); };
-	option  "X11 polices",		 action { toggle_getit (9); };
-	option  "X11 serveurs",		 action { toggle_getit (10); };
-	option  "X11 clients contribués", action { toggle_getit (11); };
-	option  "X11 développement",	 action { toggle_getit (12); };
-	option  "X11 Misc.",		 action { toggle_getit (13); };
+	option	"Kernel (INTEGRATOR)",	 action { toggle_getit (0); };
+	option	"Kernel (IQ80310)",	 action { toggle_getit (1); };
+	option	"Kernel (IQ80321)",	 action { toggle_getit (2); };
+	option	"Kernel (TEAMASA_NPWR)", action { toggle_getit (3); };
+	option	"Base",			 action { toggle_getit (4); };
+	option	"System (/etc)",	 action { toggle_getit (5); };
+	option  "Outils de développement", 	 action { toggle_getit (6); };
+	option  "Jeux", 		 action { toggle_getit (7); };
+	option  "Pages de manuel", 	 action { toggle_getit (8); };
+	option  "Divers", 	 action { toggle_getit (9); };
+	option  "Outils de manipulation de textes", action { toggle_getit (10); };
+	option  "X11 base et clients",	 action { toggle_getit (11); };
+	option  "X11 polices",		 action { toggle_getit (12); };
+	option  "X11 serveurs",		 action { toggle_getit (13); };
+	option  "X11 clients contribués", action { toggle_getit (14); };
+	option  "X11 développement",	 action { toggle_getit (15); };
+	option  "X11 Misc.",		 action { toggle_getit (16); };
diff --git a/distrib/utils/sysinst/arch/evbarm/menus.md.pl b/distrib/utils/sysinst/arch/evbarm/menus.md.pl
index 7a7bb2aff6da..02c5b473526e 100644
--- a/distrib/utils/sysinst/arch/evbarm/menus.md.pl
+++ b/distrib/utils/sysinst/arch/evbarm/menus.md.pl
@@ -1,4 +1,4 @@
-/*	$NetBSD: menus.md.pl,v 1.1 2002/04/13 01:47:55 thorpej Exp $	*/
+/*	$NetBSD: menus.md.pl,v 1.2 2002/04/13 02:34:18 thorpej Exp $	*/
 /* Based on english version: */
 /*	NetBSD: menus.md.en,v 1.2 2002/03/31 02:14:06 thorpej Exp */
 
@@ -59,17 +59,20 @@ menu editfsparts, y=12, exit;
  
 menu md_distcustom, x=26, y=5, exit, title "Wybierz";
 	display action { show_cur_distsets (); };
-	option	"Kernel (GENERIC)",		 action { toggle_getit (0); };
-	option	"Base",						 action { toggle_getit (1); };
-	option	"System (/etc)",			 action { toggle_getit (2); };
-	option	"Compiler Tools",			 action { toggle_getit (3); };
-	option	"Games",						 action { toggle_getit (4); };
-	option	"Online Manual Pages",	 action { toggle_getit (5); };
-	option	"Miscellaneous",			 action { toggle_getit (6); };
-	option	"Text Processing Tools", action { toggle_getit (7); };
-	option	"X11 base and clients",	 action { toggle_getit (8); };
-	option	"X11 fonts",				 action { toggle_getit (9); };
-	option	"X11 servers",				 action { toggle_getit (10); };
-	option	"X contrib clients",		 action { toggle_getit (11); };
-	option	"X11 programming",		 action { toggle_getit (12); };
-	option	"X11 Misc.",				 action { toggle_getit (13); };
+	option	"Kernel (INTEGRATOR)",	 action { toggle_getit (0); };
+	option	"Kernel (IQ80310)",	 action { toggle_getit (1); };
+	option	"Kernel (IQ80321)",	 action { toggle_getit (2); };
+	option	"Kernel (TEAMASA_NPWR)", action { toggle_getit (3); };
+	option	"Base",			 action { toggle_getit (4); };
+	option	"System (/etc)",	 action { toggle_getit (5); };
+	option	"Compiler Tools",	 action { toggle_getit (6); };
+	option	"Games",		 action { toggle_getit (7); };
+	option	"Online Manual Pages",	 action { toggle_getit (8); };
+	option	"Miscellaneous",	 action { toggle_getit (9); };
+	option	"Text Processing Tools", action { toggle_getit (10); };
+	option	"X11 base and clients",	 action { toggle_getit (11); };
+	option	"X11 fonts",		 action { toggle_getit (12); };
+	option	"X11 servers",		 action { toggle_getit (13); };
+	option	"X contrib clients",	 action { toggle_getit (14); };
+	option	"X11 programming",	 action { toggle_getit (15); };
+	option	"X11 Misc.",		 action { toggle_getit (16); };