Port-i386 archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Rename netbsd-INSTALL_FLOPPY to netbsd-INSTALL



Dear all,

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



Index: distrib/i386/floppies/bootfloppy/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/i386/floppies/bootfloppy/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- distrib/i386/floppies/bootfloppy/Makefile   30 Apr 2008 15:29:11
-0000      1.12
+++ distrib/i386/floppies/bootfloppy/Makefile   18 Jan 2011 21:10:03 -0000
@@ -2,6 +2,6 @@

 FLOPPYBASE=    boot
 FLOPPYMAX=     3
-FLOPPYKERNEL=  netbsd-INSTALL_FLOPPY.gz
+FLOPPYKERNEL=  netbsd-INSTALL.gz

 .include "${.CURDIR}/../common/Makefile.bootfloppy"
Index: distrib/i386/floppies/bootfloppy-big/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/i386/floppies/bootfloppy-big/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- distrib/i386/floppies/bootfloppy-big/Makefile       30 Apr 2008
15:29:11 -0000      1.25
+++ distrib/i386/floppies/bootfloppy-big/Makefile       18 Jan 2011
21:10:03 -0000
@@ -16,6 +16,6 @@

 FLOPPYBASE=    boot-big
 FLOPPYSIZE=    7200
-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 -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       18 Jan 2011
21:10:03 -0000
@@ -2,7 +2,7 @@

 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/instkernel/Makefile
===================================================================
RCS file: /cvsroot/src/distrib/i386/instkernel/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- distrib/i386/instkernel/Makefile    7 Mar 2009 21:35:10 -0000       1.12
+++ distrib/i386/instkernel/Makefile    18 Jan 2011 21:10:03 -0000
@@ -18,7 +18,7 @@ ${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_FLOPPY          ${RAMDISK_B}    netbsd-INSTALL
 MDSETTARGETS+= INSTALL_XEN3_DOMU       ${RAMDISK_B}    -
 MDSETTARGETS+= INSTALL_XEN3PAE_DOMU    ${RAMDISK_B}    -
 # MDSETTARGETS+=       INSTALL_SMALL           ${RAMDISK_S}    -


-- 
Jean-Yves Migeon
jeanyves.migeon%free.fr@localhost


Home | Main Index | Thread Index | Old Index