r1394 - in trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8: config debian

[Joshua Kwan]

Author: joshk
Date: 2004-08-27 12:34:54 -0600 (Fri, 27 Aug 2004)
New Revision: 1394

Modified:
   trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/config/sparc32
   trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/config/sparc64
   trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/config/sparc64-smp
   trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/debian/changelog
Log:
disable nfsroot support

Modified: trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/config/sparc32
===================================================================
--- trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/config/sparc32	2004-08-27 18:27:45 UTC (rev 1393)
+++ trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/config/sparc32	2004-08-27 18:34:54 UTC (rev 1394)
@@ -787,21 +787,20 @@
 #
 # Network File Systems
 #
-CONFIG_NFS_FS=y
+CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
-# CONFIG_NFS_V4 is not set
+CONFIG_NFS_V4=y
 # CONFIG_NFS_DIRECTIO is not set
 CONFIG_NFSD=m
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V4=y
 CONFIG_NFSD_TCP=y
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
+CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
-CONFIG_RPCSEC_GSS_KRB5=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_SMB_FS=m
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_CIFS=m

Modified: trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/config/sparc64
===================================================================
--- trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/config/sparc64	2004-08-27 18:27:45 UTC (rev 1393)
+++ trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/config/sparc64	2004-08-27 18:34:54 UTC (rev 1394)
@@ -1038,7 +1038,7 @@
 #
 # Network File Systems
 #
-CONFIG_NFS_FS=y
+CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 CONFIG_NFS_V4=y
 # CONFIG_NFS_DIRECTIO is not set
@@ -1046,13 +1046,12 @@
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V4=y
 CONFIG_NFSD_TCP=y
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
+CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
-CONFIG_RPCSEC_GSS_KRB5=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_SMB_FS=m
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_CIFS=m

Modified: trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/config/sparc64-smp
===================================================================
--- trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/config/sparc64-smp	2004-08-27 18:27:45 UTC (rev 1393)
+++ trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/config/sparc64-smp	2004-08-27 18:34:54 UTC (rev 1394)
@@ -1039,7 +1039,7 @@
 #
 # Network File Systems
 #
-CONFIG_NFS_FS=y
+CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 CONFIG_NFS_V4=y
 # CONFIG_NFS_DIRECTIO is not set
@@ -1047,13 +1047,12 @@
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V4=y
 CONFIG_NFSD_TCP=y
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
+CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
-CONFIG_RPCSEC_GSS_KRB5=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
 CONFIG_SMB_FS=m
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_CIFS=m

Modified: trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/debian/changelog	2004-08-27 18:27:45 UTC (rev 1393)
+++ trunk/kernel/sparc/kernel-image-2.6.8-sparc-2.6.8/debian/changelog	2004-08-27 18:34:54 UTC (rev 1394)
@@ -3,9 +3,11 @@
   * Patches from David Miller added to allow d-i to work on sparc64,
     so change bdep to kernel-tree-2.6.8-5.
   * Nuke metapackages in favor of kernel-latest-2.6-sparc.
-  * Add sparc32 UP.
+  * Add sparc32 UP!
+  * Disable nfsroot support because we don't build any kernel NIC
+    drivers in any more.
 
- -- Joshua Kwan <joshk@triplehelix.org>  Thu, 26 Aug 2004 15:16:41 -0700
+ -- Joshua Kwan <joshk@triplehelix.org>  Fri, 27 Aug 2004 11:34:07 -0700
 
 kernel-image-2.6.8-sparc (2.6.8-1) unstable; urgency=high