Module Name: src
Committed By: martin
Date: Fri Nov 14 14:58:28 UTC 2014
Modified Files:
src [netbsd-7]: BUILDING Makefile build.sh
src/distrib/notes/arc [netbsd-7]: prep
src/distrib/notes/cats [netbsd-7]: prep
src/distrib/notes/common [netbsd-7]: main
src/distrib/notes/macppc [netbsd-7]: prep.OPENFIRMWARE
src/distrib/notes/sparc [netbsd-7]: install
src/doc [netbsd-7]: BUILDING.mdoc
src/share/man/man8/man8.macppc [netbsd-7]: ofwboot.8
Log Message:
Pull up following revision(s) (requested by snj in ticket #227):
Makefile: revision 1.311
build.sh: revision 1.299
doc/BUILDING.mdoc: revision 1.105
distrib/notes/macppc/prep.OPENFIRMWARE: revision 1.16
distrib/notes/macppc/prep.OPENFIRMWARE: revision 1.17
BUILDING: revision 1.110
distrib/notes/arc/prep: revision 1.3
distrib/notes/arc/prep: revision 1.4
distrib/notes/cats/prep: revision 1.12
distrib/notes/cats/prep: revision 1.13
distrib/notes/sparc/install: revision 1.58
distrib/notes/common/main: revision 1.512
share/man/man8/man8.macppc/ofwboot.8: revision 1.13
Update path to release ISOs.
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.109.2.1 src/BUILDING
cvs rdiff -u -r1.309 -r1.309.2.1 src/Makefile
cvs rdiff -u -r1.294.2.2 -r1.294.2.3 src/build.sh
cvs rdiff -u -r1.2 -r1.2.26.1 src/distrib/notes/arc/prep
cvs rdiff -u -r1.11 -r1.11.26.1 src/distrib/notes/cats/prep
cvs rdiff -u -r1.510 -r1.510.4.1 src/distrib/notes/common/main
cvs rdiff -u -r1.15 -r1.15.20.1 src/distrib/notes/macppc/prep.OPENFIRMWARE
cvs rdiff -u -r1.57 -r1.57.20.1 src/distrib/notes/sparc/install
cvs rdiff -u -r1.104 -r1.104.2.1 src/doc/BUILDING.mdoc
cvs rdiff -u -r1.12 -r1.12.10.1 src/share/man/man8/man8.macppc/ofwboot.8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/BUILDING
diff -u src/BUILDING:1.109 src/BUILDING:1.109.2.1
--- src/BUILDING:1.109 Thu Aug 7 21:46:43 2014
+++ src/BUILDING Fri Nov 14 14:58:27 2014
@@ -632,8 +632,8 @@ BUILDING
set (see above).
iso-image Create a NetBSD installation CD-ROM image in the
- RELEASEDIR/iso directory. The CD-ROM file system will have
- a layout as described in release(7).
+ RELEASEDIR/images directory. The CD-ROM file system will
+ have a layout as described in release(7).
For most machine types, the CD-ROM will be bootable, and
will automatically run the sysinst(8) menu-based
@@ -649,8 +649,8 @@ BUILDING
the RELEASEDIR/RELEASEMACHINEDIR/installation/cdrom
directory by ``make release''. These smaller images
usually contain the same tools as the larger images in
- RELEASEDIR/iso, but do not contain additional content such
- as the distribution sets.
+ RELEASEDIR/images, but do not contain additional content
+ such as the distribution sets.
Note that the mac68k port still uses an older method of
creating CD-ROM images. This requires the mkisofs(1)
@@ -659,8 +659,8 @@ BUILDING
iso-image-source
Create a NetBSD installation CD-ROM image in the
- RELEASEDIR/iso directory. The CD-ROM file system will have
- a layout as described in release(7). It will have top
+ RELEASEDIR/images directory. The CD-ROM file system will
+ have a layout as described in release(7). It will have top
level directories for the machine type and source.
For most machine types, the CD-ROM will be bootable, and
@@ -678,8 +678,8 @@ BUILDING
the RELEASEDIR/RELEASEMACHINEDIR/installation/cdrom
directory by ``make release''. These smaller images
usually contain the same tools as the larger images in
- RELEASEDIR/iso, but do not contain additional content such
- as the distribution sets.
+ RELEASEDIR/images, but do not contain additional content
+ such as the distribution sets.
Note that the mac68k port still uses an older method of
creating CD-ROM images. This requires the mkisofs(1)
Index: src/Makefile
diff -u src/Makefile:1.309 src/Makefile:1.309.2.1
--- src/Makefile:1.309 Mon Jun 16 09:06:26 2014
+++ src/Makefile Fri Nov 14 14:58:27 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.309 2014/06/16 09:06:26 apb Exp $
+# $NetBSD: Makefile,v 1.309.2.1 2014/11/14 14:58:27 martin Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -64,11 +64,11 @@
# Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs
# from ${DESTDIR}
# iso-image:
-# Create CD-ROM image in RELEASEDIR/iso.
+# Create CD-ROM image in RELEASEDIR/images.
# RELEASEDIR must already have been populated by `make release'
# or equivalent.
# iso-image-source:
-# Create CD-ROM image with source in RELEASEDIR/iso.
+# Create CD-ROM image with source in RELEASEDIR/images.
# RELEASEDIR must already have been populated by
# `make release sourcesets' or equivalent.
# live-image:
Index: src/build.sh
diff -u src/build.sh:1.294.2.2 src/build.sh:1.294.2.3
--- src/build.sh:1.294.2.2 Fri Nov 14 14:17:12 2014
+++ src/build.sh Fri Nov 14 14:58:27 2014
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.294.2.2 2014/11/14 14:17:12 martin Exp $
+# $NetBSD: build.sh,v 1.294.2.3 2014/11/14 14:58:27 martin Exp $
#
# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1034,8 +1034,8 @@ Usage: ${progname} [-EhnorUuxy] [-a arch
sourcesets Create source sets in RELEASEDIR/source/sets.
syspkgs Create syspkgs in
RELEASEDIR/RELEASEMACHINEDIR/binary/syspkgs.
- iso-image Create CD-ROM image in RELEASEDIR/iso.
- iso-image-source Create CD-ROM image with source in RELEASEDIR/iso.
+ iso-image Create CD-ROM image in RELEASEDIR/images.
+ iso-image-source Create CD-ROM image with source in RELEASEDIR/images.
live-image Create bootable live image in
RELEASEDIR/RELEASEMACHINEDIR/installation/liveimage.
install-image Create bootable installation image in
@@ -1863,7 +1863,7 @@ createmakewrapper()
eval cat <<EOF ${makewrapout}
#! ${HOST_SH}
# Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from: \$NetBSD: build.sh,v 1.294.2.2 2014/11/14 14:17:12 martin Exp $
+# Generated from: \$NetBSD: build.sh,v 1.294.2.3 2014/11/14 14:58:27 martin Exp $
# with these arguments: ${_args}
#
Index: src/distrib/notes/arc/prep
diff -u src/distrib/notes/arc/prep:1.2 src/distrib/notes/arc/prep:1.2.26.1
--- src/distrib/notes/arc/prep:1.2 Thu Apr 23 01:56:48 2009
+++ src/distrib/notes/arc/prep Fri Nov 14 14:58:28 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: prep,v 1.2 2009/04/23 01:56:48 snj Exp $
+.\" $NetBSD: prep,v 1.2.26.1 2014/11/14 14:58:28 martin Exp $
.
First and foremost, before beginning the installation process,
.Em make sure you have a reliable backup
@@ -40,7 +40,7 @@ install kernel onto a CD-R.
Go to one of the
.Nx
mirror sites and download CD-R image from the
-.Pa pub/NetBSD/iso
+.Pa pub/NetBSD/images
directory.
.Lk http://www.NetBSD.org/mirrors/#iso
.Pp
@@ -54,7 +54,7 @@ collection should get it from the offici
.Lk http://cdrecord.berlios.de/old/private/cdrecord.html
.Pp
.(disp
-.No # Ic "cdrecord -v speed=16 dev=/dev/cd0d arccd.iso"
+.No # Ic "cdrecord -v speed=16 dev=/dev/cd0d NetBSD-arc-\*V.iso"
.disp)
.Pp
You will need to substitute the correct name of the disk image file,
Index: src/distrib/notes/cats/prep
diff -u src/distrib/notes/cats/prep:1.11 src/distrib/notes/cats/prep:1.11.26.1
--- src/distrib/notes/cats/prep:1.11 Thu Apr 23 01:56:49 2009
+++ src/distrib/notes/cats/prep Fri Nov 14 14:58:28 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: prep,v 1.11 2009/04/23 01:56:49 snj Exp $
+.\" $NetBSD: prep,v 1.11.26.1 2014/11/14 14:58:28 martin Exp $
.
A \*M machine usually needs little or no preparation before installing
.Nx ,
@@ -36,7 +36,7 @@ install kernel onto a CD-R.
Go to one of the
.Nx
mirror sites and download CD-R image from the
-.Pa pub/NetBSD/iso
+.Pa pub/NetBSD/images
directory.
.Lk http://www.NetBSD.org/mirrors/#iso
.Pp
@@ -50,12 +50,11 @@ collection should get it from the offici
.Lk http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
.Pp
.(disp
-.No # Ic "cdrecord -v speed=4 dev=/dev/cd1d output.iso"
+.No # Ic "cdrecord -v speed=4 dev=/dev/cd1d NetBSD-\*V-cats.iso"
.disp)
.Pp
-You will need to substitute the correct name of the disk image file,
-speed for your CD writer, and the
-correct device for your system (for i386 it would be
+You will need to substitute the correct speed for your CD writer, as well
+as the correct device for your system (for i386 it would be
.Pa /dev/cd1d ) .
.
.Ss2 Booting from CD-ROM
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.510 src/distrib/notes/common/main:1.510.4.1
--- src/distrib/notes/common/main:1.510 Mon Mar 31 11:25:47 2014
+++ src/distrib/notes/common/main Fri Nov 14 14:58:28 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: main,v 1.510 2014/03/31 11:25:47 martin Exp $
+.\" $NetBSD: main,v 1.510.4.1 2014/11/14 14:58:28 martin Exp $
.\"
.\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -119,7 +119,7 @@ full distribution.
.Pp
These can be found
on an FTP site near you, usually located in the
-.Pa /pub/NetBSD/iso/
+.Pa /pub/NetBSD/images/
directory.
Check the list of
.Nx
Index: src/distrib/notes/macppc/prep.OPENFIRMWARE
diff -u src/distrib/notes/macppc/prep.OPENFIRMWARE:1.15 src/distrib/notes/macppc/prep.OPENFIRMWARE:1.15.20.1
--- src/distrib/notes/macppc/prep.OPENFIRMWARE:1.15 Sat Jan 14 22:56:30 2012
+++ src/distrib/notes/macppc/prep.OPENFIRMWARE Fri Nov 14 14:58:28 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: prep.OPENFIRMWARE,v 1.15 2012/01/14 22:56:30 jmcneill Exp $
+.\" $NetBSD: prep.OPENFIRMWARE,v 1.15.20.1 2014/11/14 14:58:28 martin Exp $
.if \*[OF_VERSION_3] \{\
.
.Ss2 Updating your BootROM
@@ -1177,7 +1177,7 @@ Go to one of the
mirror sites and download the CD-R image
.Pa NetBSD-\*V-macppc.iso
from the
-.Pa pub/NetBSD/iso
+.Pa pub/NetBSD/images
directory.
.Lk http://www.NetBSD.org/mirrors/#iso
.Pp
@@ -1385,12 +1385,12 @@ systems should get it from the official
.Pp
.(disp
.if \*[OF_VERSION_12] \{\
-.No # Ic "mkisofs -o output.iso -l -J -r -L -N /cdsources"
+.No # Ic "mkisofs -o NetBSD-\*V-macppc.iso -l -J -r -L -N /cdsources"
.\}
.if \*[OF_VERSION_3] \{\
-.No # Ic "mkisofs -o output.iso -hfs -part -l -J -r -L -N /cdsources"
+.No # Ic "mkisofs -o NetBSD-\*V-macppc.iso -hfs -part -l -J -r -L -N /cdsources"
.\}
-.No # Ic "cdrecord -v speed=4 dev=/dev/cd1c output.iso"
+.No # Ic "cdrecord -v speed=4 dev=/dev/cd1c NetBSD-\*V-macppc.iso"
.disp)
.Pp
You will need to substitute the correct speed for your CD writer, and the
Index: src/distrib/notes/sparc/install
diff -u src/distrib/notes/sparc/install:1.57 src/distrib/notes/sparc/install:1.57.20.1
--- src/distrib/notes/sparc/install:1.57 Sat Jan 14 22:56:30 2012
+++ src/distrib/notes/sparc/install Fri Nov 14 14:58:28 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: install,v 1.57 2012/01/14 22:56:30 jmcneill Exp $
+.\" $NetBSD: install,v 1.57.20.1 2014/11/14 14:58:28 martin Exp $
.\"
.\" Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -136,7 +136,7 @@ below.
.
If you wish to burn a CD-R containing a bootable NetBSD installation,
then you can either burn the prepared disk image in
-.Pa iso/NetBSD-\*V-sparc.iso
+.Pa images/NetBSD-\*V-sparc.iso
or create your own.
If you wish to create your own, you should follow the directions on the
.Nx
Index: src/doc/BUILDING.mdoc
diff -u src/doc/BUILDING.mdoc:1.104 src/doc/BUILDING.mdoc:1.104.2.1
--- src/doc/BUILDING.mdoc:1.104 Thu Aug 7 21:45:27 2014
+++ src/doc/BUILDING.mdoc Fri Nov 14 14:58:28 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: BUILDING.mdoc,v 1.104 2014/08/07 21:45:27 apb Exp $
+.\" $NetBSD: BUILDING.mdoc,v 1.104.2.1 2014/11/14 14:58:28 martin Exp $
.\"
.\" Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -1146,7 +1146,7 @@ be set (see above).
Create a
.Nx
installation CD-ROM image in the
-.Sy RELEASEDIR Ns Pa /iso
+.Sy RELEASEDIR Ns Pa /images
directory.
The CD-ROM file system will have a layout as described in
.Xr release 7 .
@@ -1173,7 +1173,7 @@ Note that other, smaller, CD-ROM images
directory by
.Dq "make release" .
These smaller images usually contain the same tools as the larger images in
-.Sy RELEASEDIR Ns Pa /iso ,
+.Sy RELEASEDIR Ns Pa /images ,
but do not contain additional content such as the distribution sets.
.Pp
Note that the mac68k port still uses an older method of creating
@@ -1189,7 +1189,7 @@ but which can be installed from
Create a
.Nx
installation CD-ROM image in the
-.Sy RELEASEDIR Ns Pa /iso
+.Sy RELEASEDIR Ns Pa /images
directory.
The CD-ROM file system will have a layout as described in
.Xr release 7 .
@@ -1217,7 +1217,7 @@ Note that other, smaller, CD-ROM images
directory by
.Dq make release .
These smaller images usually contain the same tools as the larger images in
-.Sy RELEASEDIR Ns Pa /iso ,
+.Sy RELEASEDIR Ns Pa /images ,
but do not contain additional content such as the distribution sets.
.Pp
Note that the mac68k port still uses an older method of creating
Index: src/share/man/man8/man8.macppc/ofwboot.8
diff -u src/share/man/man8/man8.macppc/ofwboot.8:1.12 src/share/man/man8/man8.macppc/ofwboot.8:1.12.10.1
--- src/share/man/man8/man8.macppc/ofwboot.8:1.12 Sat Mar 17 12:25:11 2012
+++ src/share/man/man8/man8.macppc/ofwboot.8 Fri Nov 14 14:58:28 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: ofwboot.8,v 1.12 2012/03/17 12:25:11 wiz Exp $
+.\" $NetBSD: ofwboot.8,v 1.12.10.1 2014/11/14 14:58:28 martin Exp $
.\"
.\" Copyright (c) 2001 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -256,10 +256,10 @@ GENERIC kernel (the same as
with RAM disk and
.Ic sysinst
included.
-.It macppccd.iso
+.It NetBSD-{RELEASE}-macppc.iso
bootable CDROM image for all supported systems.
Usually located at
-.Pa ftp://ftp.NetBSD.org/pub/NetBSD/iso/{RELEASE}/macppccd.iso
+.Pa ftp://ftp.NetBSD.org/pub/NetBSD/images/{RELEASE}/NetBSD-{RELEASE}-macppc.iso
.El
.Sh EXAMPLES
.Bl -item
