Module Name: src
Committed By: bouyer
Date: Fri Sep 7 22:13:38 UTC 2012
Modified Files:
src/doc [netbsd-6]: README.files
src/share/man/man7 [netbsd-6]: release.7
Log Message:
Pull up following revision(s) (requested by riz in ticket #548):
doc/README.files: revision 1.5
share/man/man7/release.7: revision 1.33
share/man/man7/release.7: revision 1.34
Update release(7) for the recent iso -> images change.
Fix typo.
The "iso" directory never made it into this file, but now
that "iso" is "images", document it here for the edification of
folks browsing the download directories.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.20.1 src/doc/README.files
cvs rdiff -u -r1.32 -r1.32.2.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/doc/README.files
diff -u src/doc/README.files:1.4 src/doc/README.files:1.4.20.1
--- src/doc/README.files:1.4 Fri Dec 14 21:15:52 2007
+++ src/doc/README.files Fri Sep 7 22:13:38 2012
@@ -1,4 +1,4 @@
-# $NetBSD: README.files,v 1.4 2007/12/14 21:15:52 pavel Exp $
+# $NetBSD: README.files,v 1.4.20.1 2012/09/07 22:13:38 bouyer Exp $
What's in this directory:
@@ -10,6 +10,8 @@ LAST_MINUTE Last minute changes and note
README.files This file.
+images/ Bootable images, including ISOs and USB disk images.
+
patches/ Post-release binary code patches.
shared/ Binary sets shared between multiple ports.
Index: src/share/man/man7/release.7
diff -u src/share/man/man7/release.7:1.32 src/share/man/man7/release.7:1.32.2.1
--- src/share/man/man7/release.7:1.32 Sat Jan 14 22:56:31 2012
+++ src/share/man/man7/release.7 Fri Sep 7 22:13:38 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: release.7,v 1.32 2012/01/14 22:56:31 jmcneill Exp $
+.\" $NetBSD: release.7,v 1.32.2.1 2012/09/07 22:13:38 bouyer 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 January 14, 2012
+.Dd September 6, 2012
.Dt RELEASE 7
.Os
.Sh NAME
@@ -122,19 +122,11 @@ 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
-.Dq ./build.sh ... iso-image ...
-after a
-.Dq ./build.sh -x ... release ...
-in
-.Pa src
-or created with
-.Dq ./build.sh ... iso-image-source ...
-after a
-.Dq ./build.sh -x ... release sourcesets ...
-in
-.Pa src .
+.It Sy images/
+Image files intended for use in installing
+.Nx .
+There are different types of images for different platforms, and sometimes
+multiple different image types for a single platform.
.Pp
Images in this directory, unlike images in the
.Sm off
@@ -143,10 +135,10 @@ Images in this directory, unlike images
.Aq Em rel
.Sy /
.Aq Em machine
-.Sy /installation/cdrom/
+.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
@@ -155,10 +147,31 @@ then it will also contain a
.Dq source
directory.
These images are usually bootable.
-.Bl -tag -width "NetBSD-\*[Lt]rel\*[Gt]-\*[Lt]machine_arch\*[Gt].iso"
+.Bl -tag -width "NetBSD-\*[Lt]rel\*[Gt]-\*[Lt]machine\*[Gt].iso"
.It Sy MD5
.It Sy SHA512
.It Sy NetBSD- Ns Ao Em rel Ac Ns Sy - Ns Ao Em machine Ac Ns Sy .iso
+CDROM images in ISO 9660 format, usually created with
+.Dq ./build.sh ... iso-image ...
+after a
+.Dq ./build.sh -x ... release ...
+in
+.Pa src
+or created with
+.Dq ./build.sh ... iso-image-source ...
+after a
+.Dq ./build.sh -x ... release sourcesets ...
+in
+.Pa src .
+.It Sy NetBSD- Ns Ao Em rel Ac Ns Sy - Ns Ao Em machine Ac Ns Sy -install.img.gz
+Bootable installation images intended to be written to any drive which
+appears as an
+.Xr sd 4
+type, such as USB flash disks.
+These images are created with
+.Dq ./build.sh ... install-image
+in
+.Pa src .
.El
.
.It Sy shared/
