Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Nuke the five(!) install floppies. Welcome to 2015. Approv...
details: https://anonhg.NetBSD.org/src/rev/a24df93843de
branches: trunk
changeset: 805652:a24df93843de
user: snj <snj%NetBSD.org@localhost>
date: Sun Jan 11 04:03:47 2015 +0000
description:
Nuke the five(!) install floppies. Welcome to 2015. Approved by
dsl@, Master of Port.
diffstat:
distrib/amd64/Makefile | 25 -------------
distrib/amd64/floppies/Makefile | 9 ----
distrib/amd64/floppies/bootfloppy-big/Makefile | 21 -----------
distrib/amd64/floppies/bootfloppy-com/Makefile | 7 ---
distrib/amd64/floppies/bootfloppy/Makefile | 6 ---
distrib/amd64/floppies/common/Makefile.bootfloppy | 43 -----------------------
distrib/amd64/floppies/common/boot.cfg | 11 -----
distrib/notes/amd64/contents | 6 +--
distrib/notes/common/contents | 4 +-
distrib/notes/common/main | 12 ++++-
etc/etc.amd64/Makefile.inc | 4 +-
11 files changed, 13 insertions(+), 135 deletions(-)
diffs (268 lines):
diff -r 2a147b41ded4 -r a24df93843de distrib/amd64/Makefile
--- a/distrib/amd64/Makefile Sat Jan 10 23:35:02 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-# $NetBSD: Makefile,v 1.7 2013/07/15 00:29:49 khorben Exp $
-
-SUBDIR=
-SUBDIR+= ramdisks
-SUBDIR+= .WAIT
-SUBDIR+= instkernel
-SUBDIR+= kmod
-SUBDIR+= kmod-cgdroot
-SUBDIR+= .WAIT
-SUBDIR+= cdroms
-SUBDIR+= floppies
-SUBDIR+= liveimage
-SUBDIR+= installimage
-TARGETS+= release
-
-iso_image:
- ${MAKEDIRTARGET} cdroms iso_image
-
-live_image:
- ${MAKEDIRTARGET} liveimage live_image
-
-install_image:
- ${MAKEDIRTARGET} installimage install_image
-
-.include <bsd.subdir.mk>
diff -r 2a147b41ded4 -r a24df93843de distrib/amd64/floppies/Makefile
--- a/distrib/amd64/floppies/Makefile Sat Jan 10 23:35:02 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2007/03/06 21:52:45 bouyer Exp $
-
-SUBDIR=
-SUBDIR+= bootfloppy
-SUBDIR+= bootfloppy-com
-
-TARGETS+= release
-
-.include <bsd.subdir.mk>
diff -r 2a147b41ded4 -r a24df93843de distrib/amd64/floppies/bootfloppy-big/Makefile
--- a/distrib/amd64/floppies/bootfloppy-big/Makefile Sat Jan 10 23:35:02 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile,v 1.3 2007/12/17 13:47:29 joerg Exp $
-
-# This Makefile builds a boot image on a 2.88M-sized image.
-#
-# Since NetBSD currently can't write 2.88M diskettes, its only
-# use is as a boot image for El Torito bootable CD-ROM images.
-#
-# To prepare a CD, do the following steps:
-# 1) create a release(7) tree called NetBSD-1.3I
-# 2) create NetBSD-1.3I/boot.i386/ and place boot.fs in that directory
-# 3) do ``mkisofs -A "NetBSD ${version}" -b boot.i386/boot.fs -f \
-# -o i386-cd.img -r -T NetBSD-1.3I''
-# (you may omit '-f' if you're not using symlinks in the release tree)
-# This should place the image in i386-cd.img, which can hopefully
-# be used to burn a CD.
-
-FLOPPYBASE= boot-big
-FLOPPYPAD= 1
-FLOPPYKERNEL= netbsd-INSTALL.gz
-
-.include "${.CURDIR}/../common/Makefile.bootfloppy"
diff -r 2a147b41ded4 -r a24df93843de distrib/amd64/floppies/bootfloppy-com/Makefile
--- a/distrib/amd64/floppies/bootfloppy-com/Makefile Sat Jan 10 23:35:02 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2007/12/17 13:47:30 joerg Exp $
-
-FLOPPYBASE= boot-com
-FLOPPYKERNEL= netbsd-INSTALL.gz
-FLOPPYBOOTOPTIONS= -o console=com0
-
-.include "${.CURDIR}/../common/Makefile.bootfloppy"
diff -r 2a147b41ded4 -r a24df93843de distrib/amd64/floppies/bootfloppy/Makefile
--- a/distrib/amd64/floppies/bootfloppy/Makefile Sat Jan 10 23:35:02 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2007/12/17 13:47:29 joerg Exp $
-
-FLOPPYBASE= boot
-FLOPPYKERNEL= netbsd-INSTALL.gz
-
-.include "${.CURDIR}/../common/Makefile.bootfloppy"
diff -r 2a147b41ded4 -r a24df93843de distrib/amd64/floppies/common/Makefile.bootfloppy
--- a/distrib/amd64/floppies/common/Makefile.bootfloppy Sat Jan 10 23:35:02 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-# $NetBSD: Makefile.bootfloppy,v 1.11 2011/02/08 12:25:36 jym Exp $
-#
-# Makefile snippet to create a set of USTAR floppies
-#
-
-#
-# Required variables:
-# FLOPPYBASE Basename of floppies. Floppy number ${n} will
-# be generated as ${FLOPPYBASE}${n}.fs
-# FLOPPYKERNEL Kernel to copy
-#
-# Optional variables:
-# FLOPPYKERNDIR ${FLOPPYKERNEL} is from ${.CURDIR}/../../${FLOPPYKERNDIR}
-# FLOPPY_BOOT Bootstrap to use. [${DESTDIR}/usr/mdec/boot]
-# FLOPPYBOOTOPTIONS Options for installboot, eg -o console=com0
-#
-
-.include <bsd.own.mk>
-.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
-
-FLOPPYSIZE?= 2880
-.if defined(FLOPPYSIZE) && (${FLOPPYSIZE} != 2880)
-FLOPPYMETAFILE!= printf "USTAR.volsize.%o" ${FLOPPYSIZE}
-.else
-FLOPPYSIZE= 2880
-.endif
-FLOPPYKERNDIR?= instkernel
-FLOPPYSUFFIX?= .fs
-MDEC= ${DESTDIR}/usr/mdec
-FLOPPYINSTBOOT= "${TOOL_INSTALLBOOT} ${FLOPPYBOOTOPTIONS} -m${MACHINE} @IMAGE@ ${MDEC}/bootxx_ustarfs"
-FLOPPYKERNOBJ!= cd ${.CURDIR}/../../${FLOPPYKERNDIR} && ${PRINTOBJDIR}
-
-FLOPPY_BOOT?= ${MDEC}/boot
-FLOPPY_BOOT_CFG?= ${DISTRIBDIR}/${MACHINE}/floppies/common/boot.cfg
-FLOPPY_NETBSD= ${FLOPPYKERNOBJ}/${FLOPPYKERNEL}
-FLOPPYFILES= boot boot.cfg ${FLOPPYMETAFILE} netbsd
-FLOPPYPAD= 1
-
-FLOPPY_RELEASEDIR= installation/floppy
-
-.include "${DISTRIBDIR}/common/Makefile.tarfloppy"
-
-.include <bsd.prog.mk>
diff -r 2a147b41ded4 -r a24df93843de distrib/amd64/floppies/common/boot.cfg
--- a/distrib/amd64/floppies/common/boot.cfg Sat Jan 10 23:35:02 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-banner=NetBSD floppy diskette installation
-banner================================================================================
-banner=
-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 ACPI):boot netbsd -2
-menu=Install NetBSD (no ACPI, no SMP):boot netbsd -12
-menu=Drop to boot prompt:prompt
-timeout=10
diff -r 2a147b41ded4 -r a24df93843de distrib/notes/amd64/contents
--- a/distrib/notes/amd64/contents Sat Jan 10 23:35:02 2015 +0000
+++ b/distrib/notes/amd64/contents Sun Jan 11 04:03:47 2015 +0000
@@ -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 @@
.
\*M bootable cdrom images; see below.
.
-. It Pa floppy/
-.
-\*M boot and installation floppies; see below.
-.
. It Pa misc/
.
Miscellaneous \*M installation utilities; see
diff -r 2a147b41ded4 -r a24df93843de distrib/notes/common/contents
--- a/distrib/notes/common/contents Sat Jan 10 23:35:02 2015 +0000
+++ b/distrib/notes/common/contents Sun Jan 11 04:03:47 2015 +0000
@@ -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 @@
. 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.
diff -r 2a147b41ded4 -r a24df93843de distrib/notes/common/main
--- a/distrib/notes/common/main Sat Jan 10 23:35:02 2015 +0000
+++ b/distrib/notes/common/main Sun Jan 11 04:03:47 2015 +0000
@@ -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 @@
.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 @@
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 @@
.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 @@
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 @@
.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
diff -r 2a147b41ded4 -r a24df93843de etc/etc.amd64/Makefile.inc
--- a/etc/etc.amd64/Makefile.inc Sat Jan 10 23:35:02 2015 +0000
+++ b/etc/etc.amd64/Makefile.inc Sun Jan 11 04:03:47 2015 +0000
@@ -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 @@
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 '*.*'
Home |
Main Index |
Thread Index |
Old Index