Module Name: src
Committed By: martin
Date: Fri Feb 27 09:23:03 UTC 2015
Modified Files:
src/distrib/amd64 [netbsd-7]: Makefile
src/distrib/notes/amd64 [netbsd-7]: contents
src/distrib/notes/common [netbsd-7]: contents main
src/etc/etc.amd64 [netbsd-7]: Makefile.inc
Removed Files:
src/distrib/amd64/floppies [netbsd-7]: Makefile
src/distrib/amd64/floppies/bootfloppy [netbsd-7]: Makefile
src/distrib/amd64/floppies/bootfloppy-big [netbsd-7]: Makefile
src/distrib/amd64/floppies/bootfloppy-com [netbsd-7]: Makefile
src/distrib/amd64/floppies/common [netbsd-7]: Makefile.bootfloppy
boot.cfg
Log Message:
Pull up following revision(s) (requested by snj in ticket #548):
etc/etc.amd64/Makefile.inc: revision 1.15
distrib/notes/common/contents: revision 1.171
distrib/amd64/floppies/bootfloppy-com/Makefile: file removal
distrib/notes/amd64/contents: revision 1.3
distrib/amd64/floppies/bootfloppy/Makefile: file removal
distrib/amd64/floppies/Makefile: file removal
distrib/amd64/floppies/common/boot.cfg: file removal
distrib/amd64/Makefile: revision 1.9
distrib/notes/common/main: revision 1.515
distrib/amd64/floppies/common/Makefile.bootfloppy: file removal
distrib/amd64/floppies/bootfloppy-big/Makefile: file removal
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 -r1.7.6.1 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.2.12.1 src/distrib/notes/amd64/contents
cvs rdiff -u -r1.170 -r1.170.20.1 src/distrib/notes/common/contents
cvs rdiff -u -r1.510.4.1 -r1.510.4.2 src/distrib/notes/common/main
cvs rdiff -u -r1.14.12.1 -r1.14.12.2 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/amd64/Makefile
diff -u src/distrib/amd64/Makefile:1.7 src/distrib/amd64/Makefile:1.7.6.1
--- src/distrib/amd64/Makefile:1.7 Mon Jul 15 00:29:49 2013
+++ src/distrib/amd64/Makefile Fri Feb 27 09:23:03 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/07/15 00:29:49 khorben Exp $
+# $NetBSD: Makefile,v 1.7.6.1 2015/02/27 09:23:03 martin Exp $
SUBDIR=
SUBDIR+= ramdisks
@@ -8,7 +8,6 @@ SUBDIR+= kmod
SUBDIR+= kmod-cgdroot
SUBDIR+= .WAIT
SUBDIR+= cdroms
-SUBDIR+= floppies
SUBDIR+= liveimage
SUBDIR+= installimage
TARGETS+= release
Index: src/distrib/notes/amd64/contents
diff -u src/distrib/notes/amd64/contents:1.2 src/distrib/notes/amd64/contents:1.2.12.1
--- src/distrib/notes/amd64/contents:1.2 Fri Aug 17 20:10:53 2012
+++ src/distrib/notes/amd64/contents Fri Feb 27 09:23:03 2015
@@ -1,4 +1,4 @@
-.\" $NetBSD: contents,v 1.2 2012/08/17 20:10:53 riz Exp $
+.\" $NetBSD: contents,v 1.2.12.1 2015/02/27 09:23:03 martin 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.170.20.1
--- src/distrib/notes/common/contents:1.170 Tue Feb 14 15:09:02 2012
+++ src/distrib/notes/common/contents Fri Feb 27 09:23:02 2015
@@ -1,4 +1,4 @@
-.\" $NetBSD: contents,v 1.170 2012/02/14 15:09:02 jakllsch Exp $
+.\" $NetBSD: contents,v 1.170.20.1 2015/02/27 09:23:02 martin 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.510.4.1 src/distrib/notes/common/main:1.510.4.2
--- src/distrib/notes/common/main:1.510.4.1 Fri Nov 14 14:58:28 2014
+++ src/distrib/notes/common/main Fri Feb 27 09:23:02 2015
@@ -1,4 +1,4 @@
-.\" $NetBSD: main,v 1.510.4.1 2014/11/14 14:58:28 martin Exp $
+.\" $NetBSD: main,v 1.510.4.2 2015/02/27 09:23:02 martin 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.12.1 src/etc/etc.amd64/Makefile.inc:1.14.12.2
--- src/etc/etc.amd64/Makefile.inc:1.14.12.1 Thu Dec 4 19:18:09 2014
+++ src/etc/etc.amd64/Makefile.inc Fri Feb 27 09:23:02 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.14.12.1 2014/12/04 19:18:09 snj Exp $
+# $NetBSD: Makefile.inc,v 1.14.12.2 2015/02/27 09:23:02 martin Exp $
#
# etc.amd64/Makefile.inc -- amd64-specific etc Makefile targets
#
@@ -14,13 +14,11 @@ KERNEL_SETS+= DRMKMS
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 '*.*'
