Module Name: src
Committed By: martin
Date: Fri Aug 17 20:50:51 UTC 2012
Modified Files:
src/distrib/amd64/installimage [netbsd-6]: Makefile
src/distrib/amd64/liveimage/emuimage [netbsd-6]: Makefile
src/distrib/amd64/liveimage/usbimage [netbsd-6]: Makefile
src/distrib/common [netbsd-6]: Makefile.bootcd
src/distrib/i386/installimage [netbsd-6]: Makefile
src/distrib/i386/liveimage/emuimage [netbsd-6]: Makefile
src/distrib/i386/liveimage/usbimage [netbsd-6]: Makefile
src/distrib/pmax/liveimage/emuimage [netbsd-6]: Makefile
src/distrib/sparc/liveimage/emuimage [netbsd-6]: Makefile
src/distrib/sparc64/liveimage/emuimage [netbsd-6]: Makefile
src/distrib/sun2/liveimage/emuimage [netbsd-6]: Makefile
src/distrib/sun3/liveimage/emuimage [netbsd-6]: Makefile
src/distrib/vax/liveimage/emuimage [netbsd-6]: Makefile
src/etc [netbsd-6]: Makefile
Log Message:
Pull up following revision(s) (requested by riz in ticket #506):
distrib/amd64/liveimage/emuimage/Makefile: revision 1.2
distrib/amd64/liveimage/usbimage/Makefile: revision 1.2
distrib/sun2/liveimage/emuimage/Makefile: revision 1.2
distrib/amd64/installimage/Makefile: revision 1.2
distrib/sun3/liveimage/emuimage/Makefile: revision 1.2
distrib/pmax/liveimage/emuimage/Makefile: revision 1.2
distrib/vax/liveimage/emuimage/Makefile: revision 1.2
distrib/sparc64/liveimage/emuimage/Makefile: revision 1.2
distrib/common/Makefile.bootcd: revision 1.20
distrib/i386/liveimage/emuimage/Makefile: revision 1.2
distrib/sparc/liveimage/emuimage/Makefile: revision 1.2
distrib/i386/installimage/Makefile: revision 1.2
distrib/i386/liveimage/usbimage/Makefile: revision 1.2
etc/Makefile: revision 1.398
Change the naming scheme of "live" images and usb install images
to incorporate the OS name and version.
XXX should also not hardcode ${BOOTDISK} in the name, but that would
require reordering stuff and more testing than I have time for right now.
Another day.
As discussed on current-users@ back in March, with some adjustments.
Install fully-populated .iso images in ${RELEASEDIR}/images instead
of ${RELEASEDIR}/iso, since we'll be putting non-iso images in there too.
Install live images and install images into ${RELEASEDIR}/images by
default, to keep all the large files (such as ISOs) together.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.2.1 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.1 -r1.1.2.1 src/distrib/amd64/liveimage/emuimage/Makefile
cvs rdiff -u -r1.1 -r1.1.2.1 src/distrib/amd64/liveimage/usbimage/Makefile
cvs rdiff -u -r1.19 -r1.19.2.1 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.1 -r1.1.2.1 src/distrib/i386/installimage/Makefile
cvs rdiff -u -r1.1 -r1.1.2.1 src/distrib/i386/liveimage/emuimage/Makefile
cvs rdiff -u -r1.1 -r1.1.2.1 src/distrib/i386/liveimage/usbimage/Makefile
cvs rdiff -u -r1.1 -r1.1.2.1 src/distrib/pmax/liveimage/emuimage/Makefile
cvs rdiff -u -r1.1 -r1.1.2.1 src/distrib/sparc/liveimage/emuimage/Makefile
cvs rdiff -u -r1.1 -r1.1.2.1 src/distrib/sparc64/liveimage/emuimage/Makefile
cvs rdiff -u -r1.1 -r1.1.2.1 src/distrib/sun2/liveimage/emuimage/Makefile
cvs rdiff -u -r1.1 -r1.1.2.1 src/distrib/sun3/liveimage/emuimage/Makefile
cvs rdiff -u -r1.1 -r1.1.2.1 src/distrib/vax/liveimage/emuimage/Makefile
cvs rdiff -u -r1.396 -r1.396.2.1 src/etc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.1 src/distrib/amd64/installimage/Makefile:1.1.2.1
--- src/distrib/amd64/installimage/Makefile:1.1 Sun Jan 22 03:53:29 2012
+++ src/distrib/amd64/installimage/Makefile Fri Aug 17 20:50:50 2012
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2012/01/22 03:53:29 tsutsui Exp $
+# $NetBSD: Makefile,v 1.1.2.1 2012/08/17 20:50:50 martin Exp $
.include <bsd.own.mk>
-INSTIMGBASE= amd64inst # gives ${IMGBASE}.img
+INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-install # gives ${IMGBASE}.img
BOOTDISK= sd0 # for USB flash etc.
IMAGEMB= 550 # for all installation binaries
Index: src/distrib/amd64/liveimage/emuimage/Makefile
diff -u src/distrib/amd64/liveimage/emuimage/Makefile:1.1 src/distrib/amd64/liveimage/emuimage/Makefile:1.1.2.1
--- src/distrib/amd64/liveimage/emuimage/Makefile:1.1 Sun Jan 22 03:53:29 2012
+++ src/distrib/amd64/liveimage/emuimage/Makefile Fri Aug 17 20:50:50 2012
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2012/01/22 03:53:29 tsutsui Exp $
+# $NetBSD: Makefile,v 1.1.2.1 2012/08/17 20:50:50 martin Exp $
-LIVEIMGBASE= amd64emu # gives ${IMGBASE}.img
+LIVEIMGBASE= NetBSD-${DISTRIBVER}-amd64-live-wd0root # gives ${IMGBASE}.img
BOOTDISK= wd0 # for QEMU etc.
Index: src/distrib/amd64/liveimage/usbimage/Makefile
diff -u src/distrib/amd64/liveimage/usbimage/Makefile:1.1 src/distrib/amd64/liveimage/usbimage/Makefile:1.1.2.1
--- src/distrib/amd64/liveimage/usbimage/Makefile:1.1 Sun Jan 22 03:53:29 2012
+++ src/distrib/amd64/liveimage/usbimage/Makefile Fri Aug 17 20:50:50 2012
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2012/01/22 03:53:29 tsutsui Exp $
+# $NetBSD: Makefile,v 1.1.2.1 2012/08/17 20:50:50 martin Exp $
-LIVEIMGBASE= amd64live # gives ${IMGBASE}.img
+LIVEIMGBASE= NetBSD-${DISTRIBVER}-amd64-live-sd0root # gives ${IMGBASE}.img
BOOTDISK= sd0 # for USB flash etc.
IMAGEMB= 1536 # 2GB USB flash memories aren't 2GiB
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.19 src/distrib/common/Makefile.bootcd:1.19.2.1
--- src/distrib/common/Makefile.bootcd:1.19 Sun Jan 22 03:53:32 2012
+++ src/distrib/common/Makefile.bootcd Fri Aug 17 20:50:51 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.19 2012/01/22 03:53:32 tsutsui Exp $
+# $NetBSD: Makefile.bootcd,v 1.19.2.1 2012/08/17 20:50:51 martin Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -43,7 +43,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/i386/installimage/Makefile
diff -u src/distrib/i386/installimage/Makefile:1.1 src/distrib/i386/installimage/Makefile:1.1.2.1
--- src/distrib/i386/installimage/Makefile:1.1 Sun Jan 22 03:53:30 2012
+++ src/distrib/i386/installimage/Makefile Fri Aug 17 20:50:51 2012
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2012/01/22 03:53:30 tsutsui Exp $
+# $NetBSD: Makefile,v 1.1.2.1 2012/08/17 20:50:51 martin Exp $
.include <bsd.own.mk>
-INSTIMGBASE= i386inst # gives ${IMGBASE}.img
+INSTIMGBASE= NetBSD-${DISTRIBVER}-i386-install # gives ${IMGBASE}.img
BOOTDISK= sd0 # for USB flash etc.
IMAGEMB= 512 # for all installation binaries
Index: src/distrib/i386/liveimage/emuimage/Makefile
diff -u src/distrib/i386/liveimage/emuimage/Makefile:1.1 src/distrib/i386/liveimage/emuimage/Makefile:1.1.2.1
--- src/distrib/i386/liveimage/emuimage/Makefile:1.1 Sun Jan 22 03:53:30 2012
+++ src/distrib/i386/liveimage/emuimage/Makefile Fri Aug 17 20:50:51 2012
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2012/01/22 03:53:30 tsutsui Exp $
+# $NetBSD: Makefile,v 1.1.2.1 2012/08/17 20:50:51 martin Exp $
-LIVEIMGBASE= i386emu # gives ${IMGBASE}.img
+LIVEIMGBASE= NetBSD-${DISTRIBVER}-i386-live-wd0root # gives ${IMGBASE}.img
BOOTDISK= wd0 # for QEMU etc.
Index: src/distrib/i386/liveimage/usbimage/Makefile
diff -u src/distrib/i386/liveimage/usbimage/Makefile:1.1 src/distrib/i386/liveimage/usbimage/Makefile:1.1.2.1
--- src/distrib/i386/liveimage/usbimage/Makefile:1.1 Sun Jan 22 03:53:30 2012
+++ src/distrib/i386/liveimage/usbimage/Makefile Fri Aug 17 20:50:51 2012
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2012/01/22 03:53:30 tsutsui Exp $
+# $NetBSD: Makefile,v 1.1.2.1 2012/08/17 20:50:51 martin Exp $
-LIVEIMGBASE= i386live # gives ${IMGBASE}.img
+LIVEIMGBASE= NetBSD-${DISTRIBVER}-i386-live-sd0root # gives ${IMGBASE}.img
BOOTDISK= sd0 # for USB flash etc.
IMAGEMB= 1536 # 2GB USB flash memories aren't 2GiB
Index: src/distrib/pmax/liveimage/emuimage/Makefile
diff -u src/distrib/pmax/liveimage/emuimage/Makefile:1.1 src/distrib/pmax/liveimage/emuimage/Makefile:1.1.2.1
--- src/distrib/pmax/liveimage/emuimage/Makefile:1.1 Sun Jan 22 03:53:30 2012
+++ src/distrib/pmax/liveimage/emuimage/Makefile Fri Aug 17 20:50:50 2012
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2012/01/22 03:53:30 tsutsui Exp $
-LIVEIMGBASE= pmaxlive # gives ${IMGBASE}.img
+# $NetBSD: Makefile,v 1.1.2.1 2012/08/17 20:50:50 martin Exp $
+
+LIVEIMGBASE= NetBSD-${DISTRIBVER}-pmax-live-sd0root # gives ${IMGBASE}.img
.include <bsd.own.mk>
Index: src/distrib/sparc/liveimage/emuimage/Makefile
diff -u src/distrib/sparc/liveimage/emuimage/Makefile:1.1 src/distrib/sparc/liveimage/emuimage/Makefile:1.1.2.1
--- src/distrib/sparc/liveimage/emuimage/Makefile:1.1 Sun Jan 22 03:53:31 2012
+++ src/distrib/sparc/liveimage/emuimage/Makefile Fri Aug 17 20:50:51 2012
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2012/01/22 03:53:31 tsutsui Exp $
+# $NetBSD: Makefile,v 1.1.2.1 2012/08/17 20:50:51 martin Exp $
-LIVEIMGBASE= sparcemu # gives ${IMGBASE}.img
+LIVEIMGBASE= NetBSD-${DISTRIBVER}-sparc-live-sd0root # gives ${IMGBASE}.img
.include <bsd.own.mk>
Index: src/distrib/sparc64/liveimage/emuimage/Makefile
diff -u src/distrib/sparc64/liveimage/emuimage/Makefile:1.1 src/distrib/sparc64/liveimage/emuimage/Makefile:1.1.2.1
--- src/distrib/sparc64/liveimage/emuimage/Makefile:1.1 Sun Jan 22 03:53:31 2012
+++ src/distrib/sparc64/liveimage/emuimage/Makefile Fri Aug 17 20:50:50 2012
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2012/01/22 03:53:31 tsutsui Exp $
+# $NetBSD: Makefile,v 1.1.2.1 2012/08/17 20:50:50 martin Exp $
-LIVEIMGBASE= sparc64emu # gives ${IMGBASE}.img
+LIVEIMGBASE= NetBSD-${DISTRIBVER}-sparc64-live-sd0root # gives ${IMGBASE}.img
.include <bsd.own.mk>
Index: src/distrib/sun2/liveimage/emuimage/Makefile
diff -u src/distrib/sun2/liveimage/emuimage/Makefile:1.1 src/distrib/sun2/liveimage/emuimage/Makefile:1.1.2.1
--- src/distrib/sun2/liveimage/emuimage/Makefile:1.1 Sun Jan 22 03:53:31 2012
+++ src/distrib/sun2/liveimage/emuimage/Makefile Fri Aug 17 20:50:50 2012
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2012/01/22 03:53:31 tsutsui Exp $
+# $NetBSD: Makefile,v 1.1.2.1 2012/08/17 20:50:50 martin Exp $
-LIVEIMGBASE= sun2emu # gives ${IMGBASE}.img
+LIVEIMGBASE= NetBSD-${DISTRIBVER}-sun2-live-sd0root # gives ${IMGBASE}.img
.include <bsd.own.mk>
Index: src/distrib/sun3/liveimage/emuimage/Makefile
diff -u src/distrib/sun3/liveimage/emuimage/Makefile:1.1 src/distrib/sun3/liveimage/emuimage/Makefile:1.1.2.1
--- src/distrib/sun3/liveimage/emuimage/Makefile:1.1 Sun Jan 22 03:53:31 2012
+++ src/distrib/sun3/liveimage/emuimage/Makefile Fri Aug 17 20:50:50 2012
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2012/01/22 03:53:31 tsutsui Exp $
+# $NetBSD: Makefile,v 1.1.2.1 2012/08/17 20:50:50 martin Exp $
-LIVEIMGBASE= sun3emu # gives ${IMGBASE}.img
+LIVEIMGBASE= NetBSD-${DISTRIBVER}-sun3-live-sd0root # gives ${IMGBASE}.img
.include <bsd.own.mk>
Index: src/distrib/vax/liveimage/emuimage/Makefile
diff -u src/distrib/vax/liveimage/emuimage/Makefile:1.1 src/distrib/vax/liveimage/emuimage/Makefile:1.1.2.1
--- src/distrib/vax/liveimage/emuimage/Makefile:1.1 Sun Jan 22 03:53:32 2012
+++ src/distrib/vax/liveimage/emuimage/Makefile Fri Aug 17 20:50:50 2012
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2012/01/22 03:53:32 tsutsui Exp $
-LIVEIMGBASE= vaxlive # gives ${IMGBASE}.img
+# $NetBSD: Makefile,v 1.1.2.1 2012/08/17 20:50:50 martin Exp $
+
+LIVEIMGBASE= NetBSD-${DISTRIBVER}-vax-live-ra0root # gives ${IMGBASE}.img
.include <bsd.own.mk>
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.396 src/etc/Makefile:1.396.2.1
--- src/etc/Makefile:1.396 Sun Jan 22 03:53:33 2012
+++ src/etc/Makefile Fri Aug 17 20:50:51 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.396 2012/01/22 03:53:33 tsutsui Exp $
+# $NetBSD: Makefile,v 1.396.2.1 2012/08/17 20:50:51 martin Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -481,7 +481,7 @@ iso-image-md-post: .PHONY check_DESTDIR
# LIVEIMG_RELEASEDIR specifies where to install live images and
# it can be set in MD etc.${MACHINE}/Makefile.inc.
#
-LIVEIMG_RELEASEDIR?= ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/liveimage
+LIVEIMG_RELEASEDIR?= ${RELEASEDIR}/images
live-image: .PHONY check_DESTDIR check_RELEASEDIR
${MAKEDIRTARGET} ${NETBSDSRCDIR}/distrib live_image \
@@ -495,7 +495,7 @@ live-image: .PHONY check_DESTDIR check_R
# INSTIMG_RELEASEDIR specifies where to install live images and
# it can be set in MD etc.${MACHINE}/Makefile.inc.
#
-INSTIMG_RELEASEDIR?= ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/installimage
+INSTIMG_RELEASEDIR?= ${RELEASEDIR}/images
install-image: .PHONY check_DESTDIR check_RELEASEDIR
${MAKEDIRTARGET} ${NETBSDSRCDIR}/distrib install_image \
