Port-i386 archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: Rename netbsd-INSTALL_FLOPPY to netbsd-INSTALL
On 18.01.2011 22:31, Jean-Yves Migeon wrote:
> I adjusted amd64 ISO and module build so it is close to what i386
> provide for installation.
>
> As explained [1], I would like to rename INSTALL_FLOPPY to simply
> INSTALL. The INSTALL config(5) file was removed when we moved to
> miniroot.kmod [2], and INSTALL kernel was renamed to INSTALL_FLOPPY [3].
>
> This change makes i386 and amd64 similar (same paths for install kernels).
>
> Note that, while paths look similar, i386 INSTALL_FLOPPY is quite
> different to amd64 INSTALL, which is just a GENERIC kernel + md(4)
> hooks. No troll intended, but building a "floppy" install kernel which
> is 3+MiB in size is... weird (which makes me believe that INSTALL_FLOPPY
> is used as an INSTALL replacement).
>
> Thoughts?
>
> [1] http://mail-index.netbsd.org/port-i386/2011/01/14/msg002247.html
> [2]
> http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/arch/i386/conf/Attic/INSTALL?only_with_tag=MAIN
> [3]
> http://cvsweb.netbsd.org/bsdweb.cgi/src/etc/etc.i386/Makefile.inc?rev=1.57&content-type=text/x-cvsweb-markup
So far, no comments nor objections after ~ three weeks, I have the
impression that everyone agrees (or nobody disagrees :) )
I'll commit the following patch in a day or two. It will:
- reinstate the original INSTALL kernel (GENERIC + ramdisk included),
- use this kernel for floppies
- comment out INSTALL_FLOPPY build
- comment out bootfloppy-big, as we don't use it for El Torito cdroms
anymore; I don't think there are many around there with 3.6+MiB floppies
anyway
The big difference between using INSTALL_FLOPPY and INSTALL is that we
follow GENERIC closely with INSTALL. This is better than having a
spcific INSTALL_FLOPPY kernel, where certain features may render the
image useless on real hardware when time passes (ACPI support comes to
mind). And given that GENERIC is a lot more "tested" than INSTALL_FLOPPY
in this regard...
--
Jean-Yves Migeon
jeanyves.migeon%free.fr@localhost
Index: distrib/i386/floppies/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/i386/floppies/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- distrib/i386/floppies/Makefile 3 Sep 2008 22:07:12 -0000 1.37
+++ distrib/i386/floppies/Makefile 8 Feb 2011 12:25:47 -0000
@@ -2,8 +2,8 @@
SUBDIR=
SUBDIR+= bootfloppy
-SUBDIR+= bootfloppy-big
SUBDIR+= bootfloppy-com
+# SUBDIR+= bootfloppy-big
# These are all rather archaic...
# SUBDIR+= bootfloppy-ps2
# SUBDIR+= bootfloppy-small
Index: distrib/i386/floppies/bootfloppy/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/i386/floppies/bootfloppy/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- distrib/i386/floppies/bootfloppy/Makefile 30 Apr 2008 15:29:11 -0000
1.12
+++ distrib/i386/floppies/bootfloppy/Makefile 8 Feb 2011 12:25:47 -0000
@@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.12 2008/04/30 15:29:11 ad Exp $
FLOPPYBASE= boot
-FLOPPYMAX= 3
-FLOPPYKERNEL= netbsd-INSTALL_FLOPPY.gz
+FLOPPYKERNEL= netbsd-INSTALL.gz
.include "${.CURDIR}/../common/Makefile.bootfloppy"
Index: distrib/i386/floppies/bootfloppy-com/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/i386/floppies/bootfloppy-com/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- distrib/i386/floppies/bootfloppy-com/Makefile 30 Apr 2008 15:29:11
-0000 1.7
+++ distrib/i386/floppies/bootfloppy-com/Makefile 8 Feb 2011 12:25:47
-0000
@@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.7 2008/04/30 15:29:11 ad 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: distrib/i386/floppies/common/Makefile.bootfloppy
===================================================================
RCS file: /cvsroot/src/distrib/i386/floppies/common/Makefile.bootfloppy,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile.bootfloppy
--- distrib/i386/floppies/common/Makefile.bootfloppy 4 Nov 2008 23:02:52
-0000 1.22
+++ distrib/i386/floppies/common/Makefile.bootfloppy 8 Feb 2011 12:25:47
-0000
@@ -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 @@ FLOPPYINSTBOOT= "${TOOL_INSTALLBOOT} ${
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: distrib/i386/floppies/common/boot.cfg
===================================================================
RCS file: /cvsroot/src/distrib/i386/floppies/common/boot.cfg,v
retrieving revision 1.2
diff -u -p -r1.2 boot.cfg
--- distrib/i386/floppies/common/boot.cfg 8 Mar 2009 05:38:32 -0000
1.2
+++ distrib/i386/floppies/common/boot.cfg 8 Feb 2011 12:25:47 -0000
@@ -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: distrib/i386/instkernel/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/i386/instkernel/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- distrib/i386/instkernel/Makefile 7 Mar 2009 21:35:10 -0000 1.12
+++ distrib/i386/instkernel/Makefile 8 Feb 2011 12:25:47 -0000
@@ -18,9 +18,10 @@ ${V}= ${${V}DIR}/${F}.fs
# 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: distrib/notes/common/contents
===================================================================
RCS file: /cvsroot/src/distrib/notes/common/contents,v
retrieving revision 1.165
diff -u -p -r1.165 contents
--- distrib/notes/common/contents 30 Jan 2011 18:04:41 -0000 1.165
+++ distrib/notes/common/contents 8 Feb 2011 12:25:48 -0000
@@ -91,11 +91,6 @@ Symbols for
The monolithic kernel which doesn't use kernel modules.
. It Pa netbsd-INSTALL.gz
The installation kernel.
-.
-. It Pa netbsd-INSTALL_FLOPPY.gz
-A version of
-.Li INSTALL
-for older machines without CD-ROM drives.
. It Pa netbsd-INSTALL_XEN3PAE_DOMU.gz
. It Pa netbsd-INSTALL_XEN3_DOMU.gz
. It Pa netbsd-XEN3PAE_DOMU.gz
Index: etc/etc.i386/Makefile.inc
===================================================================
RCS file: /cvsroot/src/etc/etc.i386/Makefile.inc,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile.inc
--- etc/etc.i386/Makefile.inc 1 Oct 2009 11:51:04 -0000 1.64
+++ etc/etc.i386/Makefile.inc 8 Feb 2011 12:25:50 -0000
@@ -15,9 +15,10 @@ KERNEL_SETS+= XEN3PAE_DOMU
# 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
--- /dev/null 2011-02-08 13:43:29.000000000 +0100
+++ sys/arch/i386/conf/INSTALL 2011-01-20 19:55:57.000000000 +0100
@@ -0,0 +1,15 @@
+# $NetBSD: INSTALL,v 1.325 2008/05/02 15:26:38 ad Exp $
+#
+# INSTALL - Installation kernel.
+#
+# This kernel is derived from GENERIC with additional memory disk
+# options.
+
+include "arch/i386/conf/GENERIC"
+
+#ident "INSTALL-$Revision: 1.325 $"
+
+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
Home |
Main Index |
Thread Index |
Old Index