Module Name: src
Committed By: snj
Date: Sun Jan 11 04:03:47 UTC 2015
Modified Files:
src/distrib/notes/amd64: contents
src/distrib/notes/common: contents main
src/etc/etc.amd64: Makefile.inc
Removed Files:
src/distrib/amd64: Makefile
src/distrib/amd64/floppies: Makefile
src/distrib/amd64/floppies/bootfloppy: Makefile
src/distrib/amd64/floppies/bootfloppy-big: Makefile
src/distrib/amd64/floppies/bootfloppy-com: Makefile
src/distrib/amd64/floppies/common: Makefile.bootfloppy boot.cfg
Log Message:
Nuke the five(!) install floppies. Welcome to 2015. Approved by
dsl@, Master of Port.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r0 src/distrib/amd64/Makefile
cvs rdiff -u -r1.3 -r0 src/distrib/amd64/floppies/Makefile
cvs rdiff -u -r1.5 -r0 src/distrib/amd64/floppies/bootfloppy/Makefile
cvs rdiff -u -r1.3 -r0 src/distrib/amd64/floppies/bootfloppy-big/Makefile
cvs rdiff -u -r1.6 -r0 src/distrib/amd64/floppies/bootfloppy-com/Makefile
cvs rdiff -u -r1.11 -r0 src/distrib/amd64/floppies/common/Makefile.bootfloppy
cvs rdiff -u -r1.3 -r0 src/distrib/amd64/floppies/common/boot.cfg
cvs rdiff -u -r1.2 -r1.3 src/distrib/notes/amd64/contents
cvs rdiff -u -r1.170 -r1.171 src/distrib/notes/common/contents
cvs rdiff -u -r1.514 -r1.515 src/distrib/notes/common/main
cvs rdiff -u -r1.14 -r1.15 src/etc/etc.amd64/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/amd64/contents
diff -u src/distrib/notes/amd64/contents:1.2 src/distrib/notes/amd64/contents:1.3
--- src/distrib/notes/amd64/contents:1.2 Fri Aug 17 20:10:53 2012
+++ src/distrib/notes/amd64/contents Sun Jan 11 04:03:47 2015
@@ -1,4 +1,4 @@
-.\" $NetBSD: contents,v 1.2 2012/08/17 20:10:53 riz Exp $
+.\" $NetBSD: contents,v 1.3 2015/01/11 04:03:47 snj Exp $
.\"
.\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -75,10 +75,6 @@ see below.
.
\*M bootable cdrom images; see below.
.
-. It Pa floppy/
-.
-\*M boot and installation floppies; see below.
-.
. It Pa misc/
.
Miscellaneous \*M installation utilities; see
Index: src/distrib/notes/common/contents
diff -u src/distrib/notes/common/contents:1.170 src/distrib/notes/common/contents:1.171
--- src/distrib/notes/common/contents:1.170 Tue Feb 14 15:09:02 2012
+++ src/distrib/notes/common/contents Sun Jan 11 04:03:47 2015
@@ -1,4 +1,4 @@
-.\" $NetBSD: contents,v 1.170 2012/02/14 15:09:02 jakllsch Exp $
+.\" $NetBSD: contents,v 1.171 2015/01/11 04:03:47 snj Exp $
.\"
.\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -272,7 +272,7 @@ see below.
. It Pa bootfs/
Netbootable RAM disk kernel and the file system in the RAM disk; see below.
.\}
-.if \n[alpha]:\n[amd64]:\n[amiga]:\n[atari]:\n[bebox]:\n[ews4800mips]:\
+.if \n[alpha]:\n[amiga]:\n[atari]:\n[bebox]:\n[ews4800mips]:\
\n[i386]:\n[news68k]:\n[newsmips]:\n[sparc]:\n[x68k]:\n[prep] \{\
. It Pa floppy/
\*M boot and installation floppies; see below.
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.514 src/distrib/notes/common/main:1.515
--- src/distrib/notes/common/main:1.514 Wed Jan 7 10:22:54 2015
+++ src/distrib/notes/common/main Sun Jan 11 04:03:47 2015
@@ -1,4 +1,4 @@
-.\" $NetBSD: main,v 1.514 2015/01/07 10:22:54 knakahara Exp $
+.\" $NetBSD: main,v 1.515 2015/01/11 04:03:47 snj Exp $
.\"
.\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -137,6 +137,8 @@ is for VGA console installation, and
.Pa boot-com.iso
is for installation over serial console (com0, 9600 baud).
.Pp
+.\} \" amd64:i386
+.if \n[i386] \{\
Option 3: boot floppy images from
.Pa \*M/installation/floppy/ .
.Pp
@@ -148,6 +150,8 @@ are floppy images for VGA console instal
and
.Pa boot-com2.fs
are for installation via serial console (com0, 9600 baud).
+.\} \" i386
+.if \n[i386]:\n[amd64] \{\
.It
The default kernel on CD-ROMs has ACPI enabled.
This is known to cause issues on a few machines which have buggy ACPI
@@ -205,7 +209,7 @@ The actual binary distribution is in the
.Pa \*M/binary/sets/
directory.
When you boot the install
-.if \n[amd64] image, CD-ROM or floppies,
+.if \n[amd64] image or CD-ROM,
.if \n[i386] image, CD-ROM or floppies,
.if \n[macppc] kernel from floppies, hard drive, or CD-ROM,
.if \n[sparc] floppies or CD-ROM,
@@ -233,10 +237,11 @@ In a typical workstation installation yo
all the installation sets.
.ie \n[i386]:\n[amd64] \{\
.It
-Write the CD-ROM images or floppy images out.
+Write the boot images
.Pp
Many commercial and freeware programs are available to burn CD-ROMs.
.Pp
+.if \n[i386] \{\
If you have problems writing a raw image to a floppy,
the
.Ic rawrite.exe
@@ -249,6 +254,7 @@ in the
.Pa i386/installation/misc/
directory may be of help.
.\}
+.\}
.if \n[macppc] \{\
.It
If your \*M has a floppy drive, create the pair of boot floppies using
Index: src/etc/etc.amd64/Makefile.inc
diff -u src/etc/etc.amd64/Makefile.inc:1.14 src/etc/etc.amd64/Makefile.inc:1.15
--- src/etc/etc.amd64/Makefile.inc:1.14 Wed Jul 4 13:54:20 2012
+++ src/etc/etc.amd64/Makefile.inc Sun Jan 11 04:03:47 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.14 2012/07/04 13:54:20 reinoud Exp $
+# $NetBSD: Makefile.inc,v 1.15 2015/01/11 04:03:47 snj Exp $
#
# etc.amd64/Makefile.inc -- amd64-specific etc Makefile targets
#
@@ -13,13 +13,11 @@ KERNEL_SETS+= XEN3_DOM0 XEN3_DOMU
BUILD_KERNELS= INSTALL INSTALL_XEN3_DOMU
INSTALLATION_DIRS+= installation/cdrom
-INSTALLATION_DIRS+= installation/floppy
INSTALLATION_DIRS+= installation/misc
INSTALLATION_DIRS+= installation/miniroot
snap_md_post:
cd ${KERNSRCDIR}/arch/i386/stand/pxeboot && ${MAKE} release
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom '*.iso'
- ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/floppy '*.fs'
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot '*.*'
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc '*.*'
