Module Name: src
Committed By: jym
Date: Thu Feb 10 00:43:20 UTC 2011
Modified Files:
src/distrib/i386/floppies: Makefile
src/distrib/i386/floppies/bootfloppy: Makefile
src/distrib/i386/floppies/bootfloppy-com: Makefile
src/distrib/i386/floppies/common: Makefile.bootfloppy boot.cfg
src/distrib/i386/instkernel: Makefile
src/etc/etc.i386: Makefile.inc
Added Files:
src/sys/arch/i386/conf: INSTALL
Log Message:
Reinstate INSTALL kernel for embedded ramdisk installs.
Reasons being:
- INSTALL is GENERIC with an embedded ramdisk, and as such, can benefit from
features included within.
- INSTALL_FLOPPY has its own config(5) file, and is tailored for "small"
floppy images; it misses features/drivers that could be needed to boot
in a decent environment for recent x86 machines (like ACPI)
- makes it closer to floppies distrib available for amd64
While here, comment out INSTALL_FLOPPY and bootfloppy-big image build. NetBSD
does not use the 3.6MiB image for El Torito cdroms anymore.
Remove the FLOPPYMAX limit; i386 needs 4 floppies now. Modify boot.cfg and
release/contents to reflect reality.
See http://mail-index.netbsd.org/port-i386/2011/02/08/msg002307.html
No comments, no objections.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/distrib/i386/floppies/Makefile
cvs rdiff -u -r1.12 -r1.13 src/distrib/i386/floppies/bootfloppy/Makefile
cvs rdiff -u -r1.7 -r1.8 src/distrib/i386/floppies/bootfloppy-com/Makefile
cvs rdiff -u -r1.22 -r1.23 \
src/distrib/i386/floppies/common/Makefile.bootfloppy
cvs rdiff -u -r1.2 -r1.3 src/distrib/i386/floppies/common/boot.cfg
cvs rdiff -u -r1.12 -r1.13 src/distrib/i386/instkernel/Makefile
cvs rdiff -u -r1.64 -r1.65 src/etc/etc.i386/Makefile.inc
cvs rdiff -u -r0 -r1.327 src/sys/arch/i386/conf/INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/i386/floppies/Makefile
diff -u src/distrib/i386/floppies/Makefile:1.37 src/distrib/i386/floppies/Makefile:1.38
--- src/distrib/i386/floppies/Makefile:1.37 Wed Sep 3 22:07:12 2008
+++ src/distrib/i386/floppies/Makefile Thu Feb 10 00:43:19 2011
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2008/09/03 22:07:12 lukem Exp $
+# $NetBSD: Makefile,v 1.38 2011/02/10 00:43:19 jym Exp $
SUBDIR=
SUBDIR+= bootfloppy
-SUBDIR+= bootfloppy-big
SUBDIR+= bootfloppy-com
+# SUBDIR+= bootfloppy-big
# These are all rather archaic...
# SUBDIR+= bootfloppy-ps2
# SUBDIR+= bootfloppy-small
Index: src/distrib/i386/floppies/bootfloppy/Makefile
diff -u src/distrib/i386/floppies/bootfloppy/Makefile:1.12 src/distrib/i386/floppies/bootfloppy/Makefile:1.13
--- src/distrib/i386/floppies/bootfloppy/Makefile:1.12 Wed Apr 30 15:29:11 2008
+++ src/distrib/i386/floppies/bootfloppy/Makefile Thu Feb 10 00:43:19 2011
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2008/04/30 15:29:11 ad Exp $
+# $NetBSD: Makefile,v 1.13 2011/02/10 00:43:19 jym Exp $
FLOPPYBASE= boot
-FLOPPYMAX= 3
-FLOPPYKERNEL= netbsd-INSTALL_FLOPPY.gz
+FLOPPYKERNEL= netbsd-INSTALL.gz
.include "${.CURDIR}/../common/Makefile.bootfloppy"
Index: src/distrib/i386/floppies/bootfloppy-com/Makefile
diff -u src/distrib/i386/floppies/bootfloppy-com/Makefile:1.7 src/distrib/i386/floppies/bootfloppy-com/Makefile:1.8
--- src/distrib/i386/floppies/bootfloppy-com/Makefile:1.7 Wed Apr 30 15:29:11 2008
+++ src/distrib/i386/floppies/bootfloppy-com/Makefile Thu Feb 10 00:43:19 2011
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2008/04/30 15:29:11 ad Exp $
+# $NetBSD: Makefile,v 1.8 2011/02/10 00:43:19 jym Exp $
FLOPPYBASE= boot-com
-FLOPPYMAX= 3
-FLOPPYKERNEL= netbsd-INSTALL_FLOPPY.gz
+FLOPPYKERNEL= netbsd-INSTALL.gz
FLOPPYBOOTOPTIONS= -o console=com0
.include "${.CURDIR}/../common/Makefile.bootfloppy"
Index: src/distrib/i386/floppies/common/Makefile.bootfloppy
diff -u src/distrib/i386/floppies/common/Makefile.bootfloppy:1.22 src/distrib/i386/floppies/common/Makefile.bootfloppy:1.23
--- src/distrib/i386/floppies/common/Makefile.bootfloppy:1.22 Tue Nov 4 23:02:52 2008
+++ src/distrib/i386/floppies/common/Makefile.bootfloppy Thu Feb 10 00:43:20 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootfloppy,v 1.22 2008/11/04 23:02:52 dbj Exp $
+# $NetBSD: Makefile.bootfloppy,v 1.23 2011/02/10 00:43:20 jym Exp $
#
# Makefile snippet to create a set of USTAR floppies
#
@@ -18,9 +18,6 @@
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
-I386COMMON= ${.CURDIR}/../common
-
-FLOPPYMAX?= 1
FLOPPYSIZE?= 2880
.if defined(FLOPPYSIZE) && (${FLOPPYSIZE} != 2880)
FLOPPYMETAFILE!= printf "USTAR.volsize.%o" ${FLOPPYSIZE}
@@ -34,7 +31,7 @@
FLOPPYKERNOBJ!= cd ${.CURDIR}/../../${FLOPPYKERNDIR} && ${PRINTOBJDIR}
FLOPPY_BOOT?= ${MDEC}/boot
-FLOPPY_BOOT_CFG?= ${I386COMMON}/boot.cfg
+FLOPPY_BOOT_CFG?= ${DISTRIBDIR}/${MACHINE}/floppies/common/boot.cfg
FLOPPY_NETBSD= ${FLOPPYKERNOBJ}/${FLOPPYKERNEL}
FLOPPYFILES= boot boot.cfg ${FLOPPYMETAFILE} netbsd
FLOPPYPAD= 1
Index: src/distrib/i386/floppies/common/boot.cfg
diff -u src/distrib/i386/floppies/common/boot.cfg:1.2 src/distrib/i386/floppies/common/boot.cfg:1.3
--- src/distrib/i386/floppies/common/boot.cfg:1.2 Sun Mar 8 05:38:32 2009
+++ src/distrib/i386/floppies/common/boot.cfg Thu Feb 10 00:43:20 2011
@@ -1,11 +1,11 @@
banner=NetBSD floppy diskette installation
banner================================================================================
banner=
-banner=These diskettes do not have support for ACPI and may not work on some
-banner=modern hardware. If the floppy disk installation does not work, please
-banner=try installing using a CD-ROM image.
+banner=ACPI should work on all modern and legacy hardware, however if you have
+banner=problems, please try disabling it.
banner=
menu=Install NetBSD:boot netbsd
-menu=Install NetBSD (no SMP):boot netbsd -12
+menu=Install NetBSD (no ACPI):boot netbsd -2
+menu=Install NetBSD (no ACPI, no SMP):boot netbsd -12
menu=Drop to boot prompt:prompt
timeout=10
Index: src/distrib/i386/instkernel/Makefile
diff -u src/distrib/i386/instkernel/Makefile:1.12 src/distrib/i386/instkernel/Makefile:1.13
--- src/distrib/i386/instkernel/Makefile:1.12 Sat Mar 7 21:35:10 2009
+++ src/distrib/i386/instkernel/Makefile Thu Feb 10 00:43:20 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2009/03/07 21:35:10 ad Exp $
+# $NetBSD: Makefile,v 1.13 2011/02/10 00:43:20 jym Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -18,9 +18,10 @@
# If you change the list of distributed install kernels, don't forget
# to update the release documentation in distrib/notes/common/contents
MDSETTARGETS+= GENERIC ${RAMDISK_B} -
-MDSETTARGETS+= INSTALL_FLOPPY ${RAMDISK_B} -
+MDSETTARGETS+= INSTALL ${RAMDISK_B} -
MDSETTARGETS+= INSTALL_XEN3_DOMU ${RAMDISK_B} -
MDSETTARGETS+= INSTALL_XEN3PAE_DOMU ${RAMDISK_B} -
+# MDSETTARGETS+= INSTALL_FLOPPY ${RAMDISK_B} -
# MDSETTARGETS+= INSTALL_SMALL ${RAMDISK_S} -
# MDSETTARGETS+= INSTALL_TINY ${RAMDISK_T} -
# MDSETTARGETS+= INSTALL_PS2 ${RAMDISK_S} -
Index: src/etc/etc.i386/Makefile.inc
diff -u src/etc/etc.i386/Makefile.inc:1.64 src/etc/etc.i386/Makefile.inc:1.65
--- src/etc/etc.i386/Makefile.inc:1.64 Thu Oct 1 11:51:04 2009
+++ src/etc/etc.i386/Makefile.inc Thu Feb 10 00:43:20 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.64 2009/10/01 11:51:04 tron Exp $
+# $NetBSD: Makefile.inc,v 1.65 2011/02/10 00:43:20 jym Exp $
#
# etc.i386/Makefile.inc -- i386-specific etc Makefile targets
#
@@ -15,9 +15,10 @@
# KERNEL_SETS+= GENERIC_TINY
# KERNEL_SETS+= GENERIC_PS2TINY
-BUILD_KERNELS+= INSTALL_FLOPPY
+BUILD_KERNELS+= INSTALL
BUILD_KERNELS+= INSTALL_XEN3_DOMU
BUILD_KERNELS+= INSTALL_XEN3PAE_DOMU
+# BUILD_KERNELS+= INSTALL_FLOPPY
# BUILD_KERNELS+= INSTALL_SMALL
# BUILD_KERNELS+= INSTALL_TINY
# BUILD_KERNELS+= INSTALL_PS2
Added files:
Index: src/sys/arch/i386/conf/INSTALL
diff -u /dev/null src/sys/arch/i386/conf/INSTALL:1.327
--- /dev/null Thu Feb 10 00:43:20 2011
+++ src/sys/arch/i386/conf/INSTALL Thu Feb 10 00:43:19 2011
@@ -0,0 +1,15 @@
+# $NetBSD: INSTALL,v 1.327 2011/02/10 00:43:19 jym Exp $
+#
+# INSTALL - Installation kernel.
+#
+# This kernel is derived from GENERIC with additional memory disk
+# options.
+
+include "arch/i386/conf/GENERIC"
+
+#ident "INSTALL-$Revision: 1.327 $"
+
+no options MEMORY_DISK_DYNAMIC
+options MEMORY_DISK_IS_ROOT # force root on memory disk
+options MEMORY_DISK_SERVER=0 # no userspace memory disk support
+options MEMORY_DISK_ROOT_SIZE=10000 # size of memory disk, in blocks
