PERFORCE change 36948 for review

[Chris Vance]

http://perforce.freebsd.org/chv.cgi?CH=36948

Change 36948 by cvance at cvance_release on 2003/08/26 07:20:15

	Make some local changes to the release/install process
	- Remove references to perl, packages, X11 since they won't
	  be on the install media
	- Make sure to build the modules for the MAC kernel

Affected files ...

.. //depot/projects/trustedbsd/sebsd/release/Makefile#5 edit
.. //depot/projects/trustedbsd/sebsd/usr.sbin/sysinstall/dist.c#4 edit
.. //depot/projects/trustedbsd/sebsd/usr.sbin/sysinstall/dist.h#4 edit
.. //depot/projects/trustedbsd/sebsd/usr.sbin/sysinstall/install.c#5 edit
.. //depot/projects/trustedbsd/sebsd/usr.sbin/sysinstall/menus.c#5 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/release/Makefile#5 (text+ko) ====

@@ -529,7 +529,7 @@
 release.4:
 .for kernel in ${KERNELS}
 	cd ${.CURDIR}/..; \
-	${CROSSMAKE} ${KERNEL_FLAGS} -DNO_MODULES \
+	${CROSSMAKE} ${KERNEL_FLAGS} \
 	    KERNCONF=${kernel} INSTKERNNAME=${kernel} kernel \
 	    DESTDIR=${RD}/trees/base
 .endfor

==== //depot/projects/trustedbsd/sebsd/usr.sbin/sysinstall/dist.c#4 (text+ko) ====

@@ -350,7 +350,7 @@
     Dists = _DIST_DEVELOPER;
     SrcDists = DIST_SRC_ALL;
     CRYPTODists = DIST_CRYPTO_ALL;
-    i = distMaybeSetPorts(self);
+    /* i = distMaybeSetPorts(self); */
     distVerifyFlags();
     return i;
 }
@@ -375,7 +375,7 @@
     Dists = _DIST_DEVELOPER;
     SrcDists = DIST_SRC_SYS;
     CRYPTODists |= DIST_CRYPTO_CRYPTO;
-    i = distMaybeSetPorts(self);
+    /* i = distMaybeSetPorts(self); */
     distVerifyFlags();
     return i;
 }
@@ -399,7 +399,7 @@
     distReset(NULL);
     Dists = _DIST_USER;
     CRYPTODists |= DIST_CRYPTO_CRYPTO;
-    i = distMaybeSetPorts(self);
+    /* i = distMaybeSetPorts(self); */
     distVerifyFlags();
     return i;
 }
@@ -436,7 +436,7 @@
     XF86Dists = DIST_XF86_ALL;
     XF86ServerDists = DIST_XF86_SERVER_ALL;
     XF86FontDists = DIST_XF86_FONTS_ALL;
-    i = distMaybeSetPorts(self);
+    /* i = distMaybeSetPorts(self); */
     distVerifyFlags();
     return i;
 }

==== //depot/projects/trustedbsd/sebsd/usr.sbin/sysinstall/dist.h#4 (text+ko) ====

@@ -141,7 +141,7 @@
 
 /* Canned distribution sets */
 #define _DIST_USER \
-	( DIST_BASE | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_CRYPTO | DIST_PERL )
+	( DIST_BASE | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_CRYPTO )
 
 #define _DIST_DEVELOPER \
 	( _DIST_USER | DIST_PROFLIBS | DIST_INFO | DIST_SRC )

==== //depot/projects/trustedbsd/sebsd/usr.sbin/sysinstall/install.c#5 (text+ko) ====

@@ -686,11 +686,13 @@
     }
 
     dialog_clear_norefresh();
+    /*
     if (!msgYesNo("The FreeBSD package collection is a collection of thousands of ready-to-run\n"
 		  "applications, from text editors to games to WEB servers and more.  Would you\n"
 		  "like to browse the collection now?")) {
 	(void)configPackages(self);
     }
+    */
 
     if (!msgYesNo("Would you like to add any initial user accounts to the system?\n"
 		  "Adding at least one account for yourself at this stage is suggested\n"

==== //depot/projects/trustedbsd/sebsd/usr.sbin/sysinstall/menus.c#5 (text+ko) ====

@@ -911,22 +911,14 @@
     "distributions",
     { { "X Exit", "Exit this menu (returning to previous)",
 	checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
-      { "All",			"All system sources, binaries and X Window System",
-	checkDistEverything,	distSetEverything, NULL, NULL, ' ', ' ', ' ' },
       { "Reset",		"Reset selected distribution list to nothing",
 	NULL,			distReset, NULL, NULL, ' ', ' ', ' ' },
       { "4 Developer",		"Full sources, binaries and doc but no games", 
 	checkDistDeveloper,	distSetDeveloper },
-      { "5 X-Developer",	"Same as above + X Window System",
-	checkDistXDeveloper,	distSetXDeveloper },
       { "6 Kern-Developer",	"Full binaries and doc, kernel sources only",
 	checkDistKernDeveloper, distSetKernDeveloper },
-      { "7 X-Kern-Developer",	"Same as above + X Window System",
-	checkDistXKernDeveloper, distSetXKernDeveloper },
       { "8 User",		"Average user - binaries and doc only",
 	checkDistUser,		distSetUser },
-      { "9 X-User",		"Same as above + X Window System",
-	checkDistXUser,		distSetXUser },
       { "A Minimal",		"The smallest configuration possible",
 	checkDistMinimum,	distSetMinimum },
       { "B Custom",		"Specify your own distribution set",
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message