Module Name: src Committed By: msaitoh Date: Fri Nov 7 08:05:14 UTC 2014
Modified Files: src/distrib/common [netbsd-5-1]: Makefile.bootcd src/distrib/notes/common [netbsd-5-1]: main src/distrib/notes/macppc [netbsd-5-1]: prep.OPENFIRMWARE src/distrib/notes/sparc [netbsd-5-1]: install src/etc [netbsd-5-1]: Makefile src/share/man/man7 [netbsd-5-1]: release.7 Log Message: Pull up following revision(s) (requested by snj in ticket #1931): share/man/man7/release.7: revision 1.32 distrib/common/Makefile.bootcd: revision 1.18 distrib/notes/macppc/prep.OPENFIRMWARE: revision 1.15 distrib/notes/sparc/install: revision 1.57 etc/Makefile: revision 1.394 distrib/notes/common/main: revision 1.484 PR# install/44593: Please give release ISO's more meaningful names Change release ISO filenames, what was once 'i386cd.iso' will now look like 'NetBSD-5.99.60-i386.iso'. ok snj@ To generate a diff of this commit: cvs rdiff -u -r1.14.2.1.6.1 -r1.14.2.1.6.2 src/distrib/common/Makefile.bootcd cvs rdiff -u -r1.425.2.14.2.8 -r1.425.2.14.2.9 src/distrib/notes/common/main cvs rdiff -u -r1.11.2.2.2.1 -r1.11.2.2.2.2 \ src/distrib/notes/macppc/prep.OPENFIRMWARE cvs rdiff -u -r1.55 -r1.55.10.1 src/distrib/notes/sparc/install cvs rdiff -u -r1.359.2.6 -r1.359.2.6.2.1 src/etc/Makefile cvs rdiff -u -r1.25.4.1.2.1 -r1.25.4.1.2.2 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.6.1 src/distrib/common/Makefile.bootcd:1.14.2.1.6.2 --- src/distrib/common/Makefile.bootcd:1.14.2.1.6.1 Wed Nov 5 14:17:32 2014 +++ src/distrib/common/Makefile.bootcd Fri Nov 7 08:05:14 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.bootcd,v 1.14.2.1.6.1 2014/11/05 14:17:32 sborrill Exp $ +# $NetBSD: Makefile.bootcd,v 1.14.2.1.6.2 2014/11/07 08:05:14 msaitoh Exp $ # # Makefile snipped to create a CD/DVD ISO # @@ -52,6 +52,7 @@ CDRELEASE_EXCLUDE= -s ',./installation/c .include <bsd.own.mk> # For PRINTOBJDIR .include <bsd.kernobj.mk> # For KERNSRCDIR +DISTRIBVER!= ${HOST_SH} ${KERNSRCDIR}/conf/osrelease.sh DISTRIBREV!= ${HOST_SH} ${KERNSRCDIR}/conf/osrelease.sh -s ISO_VOLID!= echo NETBSD_${DISTRIBREV} | tr a-z A-Z PUBLISHER?= The_NetBSD_Project @@ -67,8 +68,13 @@ RM?= rm MKDIR?= mkdir -p CHMOD?= chmod +.if ${CDRELEASE} == false +CDIMAGE= ${CDBASE}.iso +.else +CDIMAGE= NetBSD-${DISTRIBVER}-${CDBASE:S/cd$//}.iso +.endif -CLEANFILES+= ${CDBASE}.iso +CLEANFILES+= ${CDIMAGE} CLEANFILES+= bootxx.${MACHINE} @@ -109,7 +115,7 @@ prepare: # XXX include more than one directory on the image - HF # copy-releasedir: - ${RM} -f ${RELEASEDIR}/${CDROMS_RELEASEDIR}/${CDBASE}.iso + ${RM} -f ${RELEASEDIR}/${CDROMS_RELEASEDIR}/${CDIMAGE} if ${CDRELEASE}; then \ if [ ! -d ${RELEASEDIR}/${RELEASEMACHINEDIR} ]; then \ echo "Missing ${RELEASEDIR}/${RELEASEMACHINEDIR}, aborting"; \ @@ -176,12 +182,12 @@ copy-releasedir: fi image: - ${TOOL_MAKEFS} -t cd9660 -o ${_CDMAKEFSOPTIONS:Q} ${CDBASE}.iso cdrom + ${TOOL_MAKEFS} -t cd9660 -o ${_CDMAKEFSOPTIONS:Q} ${CDIMAGE} cdrom .if ${CDRELEASE} == false release: prepare .WAIT prepare_md_post .WAIT copy-releasedir .WAIT image .WAIT image_md_post ${MKDIR} ${RELEASEDIR}/${CDROMS_RELEASEDIR} - ${RELEASE_INSTALL} ${CDBASE}.iso ${RELEASEDIR}/${CDROMS_RELEASEDIR} + ${RELEASE_INSTALL} ${CDIMAGE} ${RELEASEDIR}/${CDROMS_RELEASEDIR} iso_image: .else @@ -189,7 +195,7 @@ release: iso_image: prepare .WAIT prepare_md_post .WAIT copy-releasedir .WAIT image .WAIT image_md_post ${MKDIR} ${RELEASEDIR}/${CDROMS_RELEASEDIR} - ${RELEASE_INSTALL} ${CDBASE}.iso ${RELEASEDIR}/${CDROMS_RELEASEDIR} + ${RELEASE_INSTALL} ${CDIMAGE} ${RELEASEDIR}/${CDROMS_RELEASEDIR} .endif clean: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.425.2.14.2.8 src/distrib/notes/common/main:1.425.2.14.2.9 --- src/distrib/notes/common/main:1.425.2.14.2.8 Wed Nov 5 14:17:33 2014 +++ src/distrib/notes/common/main Fri Nov 7 08:05:14 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: main,v 1.425.2.14.2.8 2014/11/05 14:17:33 sborrill Exp $ +.\" $NetBSD: main,v 1.425.2.14.2.9 2014/11/07 08:05:14 msaitoh Exp $ .\" .\" Copyright (c) 1999-2008 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -171,18 +171,18 @@ bootloader and the installation kernel .Pa macppc/binary/kernel/netbsd-GENERIC_MD.gz . If you have a CD-R, you can fetch the CD image, -.Pa macppccd-\*V.iso . +.Pa NetBSD-\*V-macppc.iso . .\} .if \n[sparc] \{\ Fetch a CD image, -.Pa sparccd-\*V.iso +.Pa NetBSD-\*V-sparc.iso or the floppy disk images, .Pa sparc/install/floppy/disk1.gz No and Pa sparc/install/floppy/disk2 . You need either the pair of floppies or the CD to boot your system. .\} .if \n[sparc64] \{\ This is either a CD image, -.Pa sparc64cd-\*V.iso +.Pa NetBSD-\*V-sparc64.iso or the installation kernel and bootloader, .Pa sparc64/binary/kernel/netbsd-INSTALL.gz No and Pa sparc64/installation/misc/ofwboot which can be booted from a Index: src/distrib/notes/macppc/prep.OPENFIRMWARE diff -u src/distrib/notes/macppc/prep.OPENFIRMWARE:1.11.2.2.2.1 src/distrib/notes/macppc/prep.OPENFIRMWARE:1.11.2.2.2.2 --- src/distrib/notes/macppc/prep.OPENFIRMWARE:1.11.2.2.2.1 Wed Nov 5 14:17:33 2014 +++ src/distrib/notes/macppc/prep.OPENFIRMWARE Fri Nov 7 08:05:14 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: prep.OPENFIRMWARE,v 1.11.2.2.2.1 2014/11/05 14:17:33 sborrill Exp $ +.\" $NetBSD: prep.OPENFIRMWARE,v 1.11.2.2.2.2 2014/11/07 08:05:14 msaitoh Exp $ .if \*[OF_VERSION_3] \{\ . .Ss2 Updating your BootROM @@ -1175,7 +1175,7 @@ system to boot the installer Go to one of the .Nx mirror sites and download the CD-R image -.Pa macppccd-\*V.iso +.Pa NetBSD-\*V-macppc.iso from the .Pa pub/NetBSD/images directory. @@ -1196,7 +1196,7 @@ systems should get it from the official .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/cd1c macppccd-\*V.iso" +.No # Ic "cdrecord -v speed=4 dev=/dev/cd1c NetBSD-\*V-macppc.iso" .disp) .Pp You will need to substitute the correct name of the disk image file, @@ -1535,7 +1535,7 @@ CD-R image is compressed, then you will .Pp Find a spare bootable drive (i.e. SCSI or IDE), and use some tool to write the disk image -.Pa macppccd-\*V.iso +.Pa NetBSD-\*V-macppc.iso to your spare drive, and boot from that drive. For example, you could use a Zip drive, a Jaz drive, a Compact Flash drive, or even a spare hard drive. @@ -1556,7 +1556,7 @@ loads the installation kernel from the I .Em From an UNIX-like machine (including MacOS X) .Pp .(disp -.No # Ic "dd if=macppccd-\*V.iso of=/dev/rsd0c" +.No # Ic "dd if=NetBSD-\*V-macppc.iso of=/dev/rsd0c" .disp) .Pp where @@ -1616,7 +1616,7 @@ Hit return (i.e. start at sector number .Pp .It Select -.Pa macppccd-\*V.iso +.Pa NetBSD-\*V-macppc.iso and click .Dq Open .Pp Index: src/distrib/notes/sparc/install diff -u src/distrib/notes/sparc/install:1.55 src/distrib/notes/sparc/install:1.55.10.1 --- src/distrib/notes/sparc/install:1.55 Sat Sep 6 19:57:14 2008 +++ src/distrib/notes/sparc/install Fri Nov 7 08:05:14 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: install,v 1.55 2008/09/06 19:57:14 tsutsui Exp $ +.\" $NetBSD: install,v 1.55.10.1 2014/11/07 08:05:14 msaitoh 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 installation/cdrom/sparccd-\*V.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 @@ -144,7 +144,7 @@ Bootable CD-ROM HOW-TO at: .Lk http://www.NetBSD.org/docs/bootcd.html#sparcimage .Pp Once you have downloaded -.Pa sparccd-\*V.iso +.Pa NetBSD-\*V-sparc.iso or created your own disk image, then you need to burn it to a CD-R. .Pp The CD-ROM attached to your Sparc must support 512 byte sectors to be Index: src/etc/Makefile diff -u src/etc/Makefile:1.359.2.6 src/etc/Makefile:1.359.2.6.2.1 --- src/etc/Makefile:1.359.2.6 Sat Jan 30 19:21:15 2010 +++ src/etc/Makefile Fri Nov 7 08:05:14 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.359.2.6 2010/01/30 19:21:15 snj Exp $ +# $NetBSD: Makefile,v 1.359.2.6.2.1 2014/11/07 08:05:14 msaitoh Exp $ # from: @(#)Makefile 8.7 (Berkeley) 5/25/95 # Environment variables without default values: @@ -427,7 +427,7 @@ release snapshot: .PHONY .MAKE check_DES # Note: At least mkisofs 2.0 should be used. # CDROM_NAME_ADD?= -CDROM.image?=${RELEASEDIR}/iso/${MACHINE}cd.iso +CDROM.image?=${RELEASEDIR}/iso/NetBSD-${DISTRIBVER}-${MACHINE}.iso CDROM.dir= ${.OBJDIR}/cdrom.dir CDROM.pathlist= ${.OBJDIR}/cdrom.pathlist Index: src/share/man/man7/release.7 diff -u src/share/man/man7/release.7:1.25.4.1.2.1 src/share/man/man7/release.7:1.25.4.1.2.2 --- src/share/man/man7/release.7:1.25.4.1.2.1 Wed Nov 5 14:17:33 2014 +++ src/share/man/man7/release.7 Fri Nov 7 08:05:14 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: release.7,v 1.25.4.1.2.1 2014/11/05 14:17:33 sborrill Exp $ +.\" $NetBSD: release.7,v 1.25.4.1.2.2 2014/11/07 08:05:14 msaitoh 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 November 3, 2014 +.Dd November 7, 2014 .Dt RELEASE 7 .Os .Sh NAME @@ -155,10 +155,10 @@ then it will also contain a .Dq source directory. These images are usually bootable. -.Bl -tag -width "\*[Lt]machine_arch\*[Gt]cd-\*[Lt]rel\*[Gt].iso" +.Bl -tag -width "NetBSD-\*[Lt]rel\*[Gt]-\*[Lt]machine\*[Gt].iso" .It Sy MD5 .It Sy SHA512 -.It Ao Em machine Ac Ns Sy cd- Ns Ao Em rel Ac Ns Sy .iso +.It Sy NetBSD- Ns Ao Em rel Ac Ns Sy - Ns Ao Em machine Ac Ns Sy .iso .El . .It Sy shared/