[src/trunk]: src PR# install/44593: Please give release ISO's more meaningful...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src PR# install/44593: Please give release ISO's more meaningful...
From: jmcneill <jmcneill%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 21:58:31 +0000
details:   https://anonhg.NetBSD.org/src/rev/e5dcc0493a76
branches:  trunk
changeset: 772749:e5dcc0493a76
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sat Jan 14 22:56:30 2012 +0000

description:
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@

diffstat:

 distrib/common/Makefile.bootcd         |  18 ++++++++++++------
 distrib/notes/common/main              |   8 ++++----
 distrib/notes/macppc/prep.OPENFIRMWARE |  12 ++++++------
 distrib/notes/sparc/install            |   6 +++---
 etc/Makefile                           |   4 ++--
 share/man/man7/release.7               |   8 ++++----
 6 files changed, 31 insertions(+), 25 deletions(-)

diffs (226 lines):

diff -r b30bbe304304 -r e5dcc0493a76 distrib/common/Makefile.bootcd
--- a/distrib/common/Makefile.bootcd    Sat Jan 14 22:40:29 2012 +0000
+++ b/distrib/common/Makefile.bootcd    Sat Jan 14 22:56:30 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.bootcd,v 1.17 2009/09/25 14:09:27 christos Exp $
+#      $NetBSD: Makefile.bootcd,v 1.18 2012/01/14 22:56:30 jmcneill Exp $
 #
 # Makefile snipped to create a CD/DVD ISO
 #
@@ -53,6 +53,7 @@
 .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
@@ -69,8 +70,13 @@
 CHMOD?=                chmod
 ECHO?=         echo
 
+.if ${CDRELEASE} == false
+CDIMAGE=       ${CDBASE}.iso
+.else
+CDIMAGE=       NetBSD-${DISTRIBVER}-${CDBASE:S/cd$//}.iso
+.endif
 
-CLEANFILES+=   ${CDBASE}.iso
+CLEANFILES+=   ${CDIMAGE}
 CLEANFILES+=   bootxx.${MACHINE}
 
 
@@ -111,7 +117,7 @@
 # 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"; \
@@ -189,12 +195,12 @@
        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_md_pre .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
@@ -202,7 +208,7 @@
 
 iso_image: prepare .WAIT prepare_md_post .WAIT copy-releasedir .WAIT image_md_pre .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:
diff -r b30bbe304304 -r e5dcc0493a76 distrib/notes/common/main
--- a/distrib/notes/common/main Sat Jan 14 22:40:29 2012 +0000
+++ b/distrib/notes/common/main Sat Jan 14 22:56:30 2012 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: main,v 1.483 2012/01/05 05:48:27 ast Exp $
+.\"    $NetBSD: main,v 1.484 2012/01/14 22:56:30 jmcneill Exp $
 .\"
 .\" Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -171,18 +171,18 @@
 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
diff -r b30bbe304304 -r e5dcc0493a76 distrib/notes/macppc/prep.OPENFIRMWARE
--- a/distrib/notes/macppc/prep.OPENFIRMWARE    Sat Jan 14 22:40:29 2012 +0000
+++ b/distrib/notes/macppc/prep.OPENFIRMWARE    Sat Jan 14 22:56:30 2012 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: prep.OPENFIRMWARE,v 1.14 2010/10/27 14:41:46 martin Exp $
+.\"    $NetBSD: prep.OPENFIRMWARE,v 1.15 2012/01/14 22:56:30 jmcneill Exp $
 .if \*[OF_VERSION_3] \{\
 .
 .Ss2 Updating your BootROM
@@ -1175,7 +1175,7 @@
 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/iso
 directory.
@@ -1196,7 +1196,7 @@
 .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 @@
 .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 @@
 .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 @@
 .Pp
 .It
 Select
-.Pa macppccd-\*V.iso
+.Pa NetBSD-\*V-macppc.iso
 and click
 .Dq Open
 .Pp
diff -r b30bbe304304 -r e5dcc0493a76 distrib/notes/sparc/install
--- a/distrib/notes/sparc/install       Sat Jan 14 22:40:29 2012 +0000
+++ b/distrib/notes/sparc/install       Sat Jan 14 22:56:30 2012 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: install,v 1.56 2010/07/11 13:26:38 mrg Exp $
+.\"    $NetBSD: install,v 1.57 2012/01/14 22:56:30 jmcneill Exp $
 .\"
 .\" Copyright (c) 1999-2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -136,7 +136,7 @@
 .
 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/sparccd.iso
+.Pa iso/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 @@
 .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
diff -r b30bbe304304 -r e5dcc0493a76 etc/Makefile
--- a/etc/Makefile      Sat Jan 14 22:40:29 2012 +0000
+++ b/etc/Makefile      Sat Jan 14 22:56:30 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.393 2011/11/02 16:39:23 yamt Exp $
+#      $NetBSD: Makefile,v 1.394 2012/01/14 22:56:31 jmcneill Exp $
 #      from: @(#)Makefile      8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -423,7 +423,7 @@
 #      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
 
diff -r b30bbe304304 -r e5dcc0493a76 share/man/man7/release.7
--- a/share/man/man7/release.7  Sat Jan 14 22:40:29 2012 +0000
+++ b/share/man/man7/release.7  Sat Jan 14 22:56:30 2012 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: release.7,v 1.31 2009/09/19 07:06:55 snj Exp $
+.\"    $NetBSD: release.7,v 1.32 2012/01/14 22:56:31 jmcneill 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 January 14, 2012
 .Dt RELEASE 7
 .Os
 .Sh NAME
@@ -155,10 +155,10 @@
 .Dq source
 directory.
 These images are usually bootable.
-.Bl -tag -width "\*[Lt]machine_arch\*[Gt]cd.iso"
+.Bl -tag -width "NetBSD-\*[Lt]rel\*[Gt]-\*[Lt]machine_arch\*[Gt].iso"
 .It Sy MD5
 .It Sy SHA512
-.It Ao Em machine Ac Ns Sy cd.iso
+.It Sy NetBSD- Ns Ao Em rel Ac Ns Sy - Ns Ao Em machine Ac Ns Sy .iso
 .El
 .
 .It Sy shared/
Prev by Date: [src/trunk]: src/sys/arch/usermode/conf add cd9660
Next by Date: [src/trunk]: src/sys/arch/usermode/conf Add options INSECURE, as sysinst requ...
Previous by Thread: [src/trunk]: src/sys/arch/usermode/conf add cd9660
Next by Thread: [src/trunk]: src/sys/arch/usermode/conf Add options INSECURE, as sysinst requ...
Indexes:
Home | Main Index | Thread Index | Old Index