Subject: GENERIC.local in INSTALL kernels unexpected (i386)
To: None <tech-kern@NetBSD.org>
From: Greg Troxel <gdt@NetBSD.org>
List: tech-kern
Date: 11/11/2005 19:47:51
I am building a NetBSD/xen box, and I want IPsec in all my kernels.
So, I put options IPSEC{,_ESP,_NAT_T} in GENERIC.local, and kicked off
a full release. It failed with INSTALL_TINY not fitting on a floppy
by 82 kB, or something like that, and I immediately realized that
INSTALL kernels include GENERIC.local. This seems wrong, so I have a
local change to have INSTALL kernels include INSTALL.local instead, so
that adding something large to GENERIC.local only adds space to
kernels one runs rather than installs.
I'm building now and will see if all the floppies fit; INSTALL_PS2
includes GENERIC_PS2TINY so therefore GENERIC.local, which seems
wrong.
Should I commit this?
Index: INSTALL.local
===================================================================
RCS file: INSTALL.local
diff -N INSTALL.local
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ INSTALL.local 12 Nov 2005 00:44:06 -0000
@@ -0,0 +1,4 @@
+# $NetBSD:$
+#
+# INSTALL.local -- local additions to the INSTALL configuration
+#
Index: INSTALL
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/conf/INSTALL,v
retrieving revision 1.272
diff -u -r1.272 INSTALL
--- INSTALL 10 Sep 2005 19:20:49 -0000 1.272
+++ INSTALL 12 Nov 2005 00:23:02 -0000
@@ -744,7 +744,7 @@
# Pull in optional local configuration
-include "arch/i386/conf/GENERIC.local"
+include "arch/i386/conf/INSTALL.local"
# Pseudo-Devices
Index: INSTALL_LAPTOP
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/conf/INSTALL_LAPTOP,v
retrieving revision 1.91
diff -u -r1.91 INSTALL_LAPTOP
--- INSTALL_LAPTOP 10 Sep 2005 19:20:49 -0000 1.91
+++ INSTALL_LAPTOP 12 Nov 2005 00:23:03 -0000
@@ -541,7 +541,7 @@
ugen* at uhub? port ? configuration ? interface ?
# Pull in optional local configuration
-include "arch/i386/conf/GENERIC.local"
+include "arch/i386/conf/INSTALL.local"
# Pseudo-Devices
Index: INSTALL_SMALL
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/conf/INSTALL_SMALL,v
retrieving revision 1.119
diff -u -r1.119 INSTALL_SMALL
--- INSTALL_SMALL 10 Sep 2005 19:20:49 -0000 1.119
+++ INSTALL_SMALL 12 Nov 2005 00:23:03 -0000
@@ -475,7 +475,7 @@
# Pull in optional local configuration
-include "arch/i386/conf/GENERIC.local"
+include "arch/i386/conf/INSTALL.local"
# Pseudo-Devices
Index: INSTALL_TINY
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/conf/INSTALL_TINY,v
retrieving revision 1.96
diff -u -r1.96 INSTALL_TINY
--- INSTALL_TINY 10 Sep 2005 19:20:49 -0000 1.96
+++ INSTALL_TINY 12 Nov 2005 00:23:04 -0000
@@ -481,7 +481,7 @@
# Pull in optional local configuration
-include "arch/i386/conf/GENERIC.local"
+include "arch/i386/conf/INSTALL.local"
# Pseudo-Devices
Index: INSTALL_XENU
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/conf/INSTALL_XENU,v
retrieving revision 1.6
diff -u -r1.6 INSTALL_XENU
--- INSTALL_XENU 10 Sep 2005 19:20:49 -0000 1.6
+++ INSTALL_XENU 12 Nov 2005 00:23:04 -0000
@@ -144,7 +144,7 @@
#sd* at hypervisor? # Xen vbd (sd identity)
#cd* at hypervisor? # Xen vbd (cd identity)
-include "arch/i386/conf/GENERIC.local"
+include "arch/i386/conf/INSTALL.local"
# Pseudo-Devices