Module Name: src
Committed By: sborrill
Date: Wed Nov 5 14:50:10 UTC 2014
Modified Files:
src/distrib/common [netbsd-5-2]: Makefile.bootcd
src/distrib/notes/arc [netbsd-5-2]: prep
src/distrib/notes/cats [netbsd-5-2]: prep
src/distrib/notes/common [netbsd-5-2]: main
src/distrib/notes/macppc [netbsd-5-2]: prep.OPENFIRMWARE
src/share/man/man7 [netbsd-5-2]: release.7
Log Message:
Apply patch (requested by snj in ticket 1930):
Install fully-populated .iso images in ${RELEASEDIR}/images instead
of ${RELEASEDIR}/iso
To generate a diff of this commit:
cvs rdiff -u -r1.14.2.1 -r1.14.2.1.10.1 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.1.6.1 -r1.1.6.1.10.1 src/distrib/notes/arc/prep
cvs rdiff -u -r1.10.2.1 -r1.10.2.1.10.1 src/distrib/notes/cats/prep
cvs rdiff -u -r1.425.2.16.2.5 -r1.425.2.16.2.6 src/distrib/notes/common/main
cvs rdiff -u -r1.11.2.2 -r1.11.2.2.6.1 \
src/distrib/notes/macppc/prep.OPENFIRMWARE
cvs rdiff -u -r1.25.4.1 -r1.25.4.1.6.1 src/share/man/man7/release.7
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.14.2.1 src/distrib/common/Makefile.bootcd:1.14.2.1.10.1
--- src/distrib/common/Makefile.bootcd:1.14.2.1 Sat Dec 6 21:30:03 2008
+++ src/distrib/common/Makefile.bootcd Wed Nov 5 14:50:10 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.14.2.1 2008/12/06 21:30:03 snj Exp $
+# $NetBSD: Makefile.bootcd,v 1.14.2.1.10.1 2014/11/05 14:50:10 sborrill Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -42,7 +42,7 @@ CDSOURCE?= false
.if ${CDRELEASE} == false
CDROMS_RELEASEDIR?= ${MACHINE}/installation/cdrom
.else
-CDROMS_RELEASEDIR?= iso
+CDROMS_RELEASEDIR?= images
.endif
.if defined(CDRELEASE_NOISOS)
CDRELEASE_EXCLUDE= -s ',./installation/cdrom.*,,gp'
Index: src/distrib/notes/arc/prep
diff -u src/distrib/notes/arc/prep:1.1.6.1 src/distrib/notes/arc/prep:1.1.6.1.10.1
--- src/distrib/notes/arc/prep:1.1.6.1 Sat Apr 25 23:16:33 2009
+++ src/distrib/notes/arc/prep Wed Nov 5 14:50:10 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: prep,v 1.1.6.1 2009/04/25 23:16:33 snj Exp $
+.\" $NetBSD: prep,v 1.1.6.1.10.1 2014/11/05 14:50:10 sborrill 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
Index: src/distrib/notes/cats/prep
diff -u src/distrib/notes/cats/prep:1.10.2.1 src/distrib/notes/cats/prep:1.10.2.1.10.1
--- src/distrib/notes/cats/prep:1.10.2.1 Sat Apr 25 23:16:33 2009
+++ src/distrib/notes/cats/prep Wed Nov 5 14:50:10 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: prep,v 1.10.2.1 2009/04/25 23:16:33 snj Exp $
+.\" $NetBSD: prep,v 1.10.2.1.10.1 2014/11/05 14:50:10 sborrill 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
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.425.2.16.2.5 src/distrib/notes/common/main:1.425.2.16.2.6
--- src/distrib/notes/common/main:1.425.2.16.2.5 Sat Jan 18 11:23:44 2014
+++ src/distrib/notes/common/main Wed Nov 5 14:50:10 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: main,v 1.425.2.16.2.5 2014/01/18 11:23:44 bouyer Exp $
+.\" $NetBSD: main,v 1.425.2.16.2.6 2014/11/05 14:50:10 sborrill Exp $
.\"
.\" Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -118,7 +118,7 @@ Option 1: bootable CD-ROM images contain
.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 NetBSD website for details.
.Pp
Index: src/distrib/notes/macppc/prep.OPENFIRMWARE
diff -u src/distrib/notes/macppc/prep.OPENFIRMWARE:1.11.2.2 src/distrib/notes/macppc/prep.OPENFIRMWARE:1.11.2.2.6.1
--- src/distrib/notes/macppc/prep.OPENFIRMWARE:1.11.2.2 Fri Nov 5 07:29:48 2010
+++ src/distrib/notes/macppc/prep.OPENFIRMWARE Wed Nov 5 14:50:10 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: prep.OPENFIRMWARE,v 1.11.2.2 2010/11/05 07:29:48 snj Exp $
+.\" $NetBSD: prep.OPENFIRMWARE,v 1.11.2.2.6.1 2014/11/05 14:50:10 sborrill 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 macppccd-\*V.iso
from the
-.Pa pub/NetBSD/iso
+.Pa pub/NetBSD/images
directory.
.Lk http://www.NetBSD.org/mirrors/#iso
.Pp
Index: src/share/man/man7/release.7
diff -u src/share/man/man7/release.7:1.25.4.1 src/share/man/man7/release.7:1.25.4.1.6.1
--- src/share/man/man7/release.7:1.25.4.1 Sun Oct 4 11:48:39 2009
+++ src/share/man/man7/release.7 Wed Nov 5 14:50:10 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: release.7,v 1.25.4.1 2009/10/04 11:48:39 bouyer Exp $
+.\" $NetBSD: release.7,v 1.25.4.1.6.1 2014/11/05 14:50:10 sborrill Exp $
.\"
.\" Copyright (c) 1997, 2000, 2005 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd September 19, 2009
+.Dd November 3, 2014
.Dt RELEASE 7
.Os
.Sh NAME
@@ -42,14 +42,14 @@ except possibly the path that leads to t
.Pp
In this document, the following special words have these definitions:
.Bl -tag -width "\*[Lt]machine_arch\*[Gt]"
-.It Em \*[Lt]machine\*[Gt]
+.It Aq Em machine
The platform for which the release was built, corresponding to the
.Em hw.machine
sysctl variable, e.g.,
.Em i386
or
.Em amiga .
-.It Em \*[Lt]machine_arch\*[Gt]
+.It Aq Em machine_arch
The architecture for which a particular installation set was built,
corresponding to the
.Em hw.machine_arch
@@ -57,7 +57,7 @@ sysctl variable, e.g.,
.Em i386
or
.Em m68k .
-.It Em \*[Lt]rel\*[Gt]
+.It Aq Em rel
The release version number.
.El
.Pp
@@ -79,7 +79,7 @@ All
.Sy MD5
files are MD5 digests for the various files in that directory, in the
format produced by the command:
-.Sy cksum -m \*[Lt]file\*[Gt] .
+.Sy cksum -a MD5 Aq Sy file .
.Pp
All
.Sy SHA512
@@ -92,7 +92,8 @@ range of operating systems can check the
.Pp
Files that end in
.Sy .tgz
-are gzipped tar archives. This is used in lieu of
+are gzipped tar archives.
+This is used in lieu of
.Sy .tar.gz
because the software used to download the sets may incorrectly auto-unpack
files ending in
@@ -112,7 +113,7 @@ CD-ROM, but in all other cases it should
.Sm off
.Xo
.Sy .../NetBSD-
-.Em \*[Lt]rel\*[Gt]
+.Aq Em rel
.Sy / .
.Xc
.Sm on
@@ -121,8 +122,8 @@ The root of the release hierarchy should
files and subdirectories:
.Pp
.Bl -tag -width "\*[Lt]machine\*[Gt]"
-.It Sy iso/
-CDROM images in ISO 9660 format, usually created with
+.It Sy images/
+CD-ROM images in ISO 9660 format, usually created with
.Dq ./build.sh ... iso-image ...
after a
.Dq ./build.sh -x ... release ...
@@ -139,13 +140,13 @@ Images in this directory, unlike images
.Sm off
.Xo
.Sy .../NetBSD-
-.Em \*[Lt]rel\*[Gt]
+.Aq Em rel
.Sy /
-.Em \*[Lt]machine\*[Gt]
-.Sy /installation/cdrom/
+.Aq Em machine
+.Sy /installation/\\*/
.Xc
.Sm on
-directory, contain file systems that
+directories, contain file systems that
have an internal layout that corresponds to
a complete release for a given machine type.
If built with
@@ -154,43 +155,43 @@ then it will also contain a
.Dq source
directory.
These images are usually bootable.
-.Bl -tag -width "\*[Lt]machine_arch\*[Gt]cd.iso"
+.Bl -tag -width "\*[Lt]machine_arch\*[Gt]cd-\*[Lt]rel\*[Gt].iso"
.It Sy MD5
.It Sy SHA512
-.It Ao Em machine Ac Ns Sy cd.iso
+.It Ao Em machine Ac Ns Sy cd- Ns Ao Em rel Ac Ns Sy .iso
.El
.
.It Sy shared/
Files shared by two or more machine types.
.Bl -tag -width "\*[Lt]machine_arch\*[Gt]"
-.It Em \*[Lt]machine_arch\*[Gt] Ns Pa /
+.It Ao Em machine_arch Ac Ns Pa /
Files which may be shared by all systems of the same
-.Em \*[Lt]machine_arch\*[Gt]
+.Aq Em machine_arch
will be located in
.Sm off
.Xo
.Sy .../NetBSD-
-.Em \*[Lt]rel\*[Gt]
+.Aq Em rel
.Sy /shared/
-.Em \*[Lt]machine_arch\*[Gt]
+.Aq Em machine_arch
.Sy /
.Xc
.Sm on
with symbolic links pointing to these files from the
-.Em \*[Lt]machine\*[Gt]
+.Aq Em machine
subdirectory.
.It Sy ALL/
Files which are completely machine-independent will be
located in
-.Sy .../NetBSD- Ns Em \*[Lt]rel\*[Gt] Ns Sy /shared/ALL/
+.Sy .../NetBSD- Ns Ao Em rel Ac Ns Sy /shared/ALL/
with symbolic links pointing to these files from the
-.Em \*[Lt]machine\*[Gt]
+.Aq Em machine
subdirectory.
.El
.
.It Sy source/
Source code of the operating system should be put into
-.Sy .../NetBSD- Ns Em \*[Lt]rel\*[Gt] Ns Sy /source/
+.Sy .../NetBSD- Ns Ao Em rel Ac Ns Sy /source/
using the following layout:
.Pp
.Bl -tag -width "sets/"
@@ -214,19 +215,21 @@ Kernel sources for all architectures plu
to build kernels (like
.Xr config 1 ) .
.It Sy xsrc.tgz
-Source code of the X Window System used on all NetBSD architectures.
+Source code of the X Window System used on all
+.Nx
+architectures.
Includes X clients and servers.
.El
.El
.
-.It Em \*[Lt]machine\*[Gt] Ns Pa /
+.It Ao Em machine Ac Ns Pa /
The binary releases in
.Sm off
.Xo
.Sy .../NetBSD-
-.Em \*[Lt]rel\*[Gt]
+.Aq Em rel
.Sy /
-.Em \*[Lt]machine\*[Gt]
+.Aq Em machine
.Sy /
.Xc
.Sm on
@@ -251,16 +254,19 @@ installation sets
.It Sy MD5
.It Sy SHA512
.It Sy base.tgz
-The base binary distribution. This set contains the base
+The base binary distribution.
+This set contains the base
.Nx
utilities that are necessary for the system to run and be minimally
functional.
This set excludes all things listed in the sets
described below.
.It Sy comp.tgz
-The compiler tools distribution. This set contains the C and C++
+The compiler tools distribution.
+This set contains the C and C++
compilers, assembler, linker, other toolchain components, and their
-manual pages. It also includes the system include files
+manual pages.
+It also includes the system include files
.Pq Pa /usr/include
and the static system libraries.
.It Sy etc.tgz
@@ -269,8 +275,12 @@ This set contains the system configurati
and in several other places throughout the file system hierarchy.
.It Sy games.tgz
This set includes the games and their manual pages.
-.It Sy kern.tgz
-This set includes a generic kernel.
+.It Sy kern-GENERIC.tgz
+This set includes a kernel built from the
+.Sy GENERIC
+kernel configuration file.
+This is meant as an example only; different
+platforms may have differently named kernels.
.It Sy man.tgz
This set includes all of the manual pages for the binaries and other
software contained in the
@@ -306,7 +316,8 @@ suitably named, gzipped kernels
.It Sy netbsd-GENERIC.gz
A kernel built from the
.Sy GENERIC
-kernel configuration file. This is meant as an example only; different
+kernel configuration file.
+This is meant as an example only; different
platforms may have differently named kernels.
.El
.El
@@ -314,7 +325,7 @@ platforms may have differently named ker
installation helper items
.Bl -tag -width "diskimage/"
.It Sy cdrom/
-CDROM images in ISO 9660 format, created as part of
+CD-ROM images in ISO 9660 format, created as part of
.Dq build.sh ... release ...
in
.Pa src .
