Module Name: src
Committed By: riz
Date: Fri Aug 17 16:56:36 UTC 2012
Modified Files:
src/distrib/amd64/installimage: Makefile
src/distrib/amd64/liveimage/emuimage: Makefile
src/distrib/amd64/liveimage/usbimage: Makefile
src/distrib/i386/installimage: Makefile
src/distrib/i386/liveimage/emuimage: Makefile
src/distrib/i386/liveimage/usbimage: Makefile
src/distrib/pmax/liveimage/emuimage: Makefile
src/distrib/sparc/liveimage/emuimage: Makefile
src/distrib/sparc64/liveimage/emuimage: Makefile
src/distrib/sun2/liveimage/emuimage: Makefile
src/distrib/sun3/liveimage/emuimage: Makefile
src/distrib/vax/liveimage/emuimage: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/liveimage/emuimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/amd64/liveimage/usbimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/i386/installimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/i386/liveimage/emuimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/i386/liveimage/usbimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/pmax/liveimage/emuimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/sparc/liveimage/emuimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/sparc64/liveimage/emuimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/sun2/liveimage/emuimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/sun3/liveimage/emuimage/Makefile
cvs rdiff -u -r1.1 -r1.2 src/distrib/vax/liveimage/emuimage/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.2
--- src/distrib/amd64/installimage/Makefile:1.1 Sun Jan 22 03:53:29 2012
+++ src/distrib/amd64/installimage/Makefile Fri Aug 17 16:56:34 2012
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2012/01/22 03:53:29 tsutsui Exp $
+# $NetBSD: Makefile,v 1.2 2012/08/17 16:56:34 riz 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.2
--- src/distrib/amd64/liveimage/emuimage/Makefile:1.1 Sun Jan 22 03:53:29 2012
+++ src/distrib/amd64/liveimage/emuimage/Makefile Fri Aug 17 16:56:35 2012
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2012/01/22 03:53:29 tsutsui Exp $
+# $NetBSD: Makefile,v 1.2 2012/08/17 16:56:35 riz 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.2
--- src/distrib/amd64/liveimage/usbimage/Makefile:1.1 Sun Jan 22 03:53:29 2012
+++ src/distrib/amd64/liveimage/usbimage/Makefile Fri Aug 17 16:56:35 2012
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2012/01/22 03:53:29 tsutsui Exp $
+# $NetBSD: Makefile,v 1.2 2012/08/17 16:56:35 riz 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/i386/installimage/Makefile
diff -u src/distrib/i386/installimage/Makefile:1.1 src/distrib/i386/installimage/Makefile:1.2
--- src/distrib/i386/installimage/Makefile:1.1 Sun Jan 22 03:53:30 2012
+++ src/distrib/i386/installimage/Makefile Fri Aug 17 16:56:35 2012
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2012/01/22 03:53:30 tsutsui Exp $
+# $NetBSD: Makefile,v 1.2 2012/08/17 16:56:35 riz 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.2
--- src/distrib/i386/liveimage/emuimage/Makefile:1.1 Sun Jan 22 03:53:30 2012
+++ src/distrib/i386/liveimage/emuimage/Makefile Fri Aug 17 16:56:35 2012
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2012/01/22 03:53:30 tsutsui Exp $
+# $NetBSD: Makefile,v 1.2 2012/08/17 16:56:35 riz 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.2
--- src/distrib/i386/liveimage/usbimage/Makefile:1.1 Sun Jan 22 03:53:30 2012
+++ src/distrib/i386/liveimage/usbimage/Makefile Fri Aug 17 16:56:35 2012
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2012/01/22 03:53:30 tsutsui Exp $
+# $NetBSD: Makefile,v 1.2 2012/08/17 16:56:35 riz 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.2
--- src/distrib/pmax/liveimage/emuimage/Makefile:1.1 Sun Jan 22 03:53:30 2012
+++ src/distrib/pmax/liveimage/emuimage/Makefile Fri Aug 17 16:56:35 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.2 2012/08/17 16:56:35 riz 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.2
--- src/distrib/sparc/liveimage/emuimage/Makefile:1.1 Sun Jan 22 03:53:31 2012
+++ src/distrib/sparc/liveimage/emuimage/Makefile Fri Aug 17 16:56:35 2012
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2012/01/22 03:53:31 tsutsui Exp $
+# $NetBSD: Makefile,v 1.2 2012/08/17 16:56:35 riz 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.2
--- src/distrib/sparc64/liveimage/emuimage/Makefile:1.1 Sun Jan 22 03:53:31 2012
+++ src/distrib/sparc64/liveimage/emuimage/Makefile Fri Aug 17 16:56:36 2012
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2012/01/22 03:53:31 tsutsui Exp $
+# $NetBSD: Makefile,v 1.2 2012/08/17 16:56:36 riz 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.2
--- src/distrib/sun2/liveimage/emuimage/Makefile:1.1 Sun Jan 22 03:53:31 2012
+++ src/distrib/sun2/liveimage/emuimage/Makefile Fri Aug 17 16:56:36 2012
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2012/01/22 03:53:31 tsutsui Exp $
+# $NetBSD: Makefile,v 1.2 2012/08/17 16:56:36 riz 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.2
--- src/distrib/sun3/liveimage/emuimage/Makefile:1.1 Sun Jan 22 03:53:31 2012
+++ src/distrib/sun3/liveimage/emuimage/Makefile Fri Aug 17 16:56:36 2012
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2012/01/22 03:53:31 tsutsui Exp $
+# $NetBSD: Makefile,v 1.2 2012/08/17 16:56:36 riz 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.2
--- src/distrib/vax/liveimage/emuimage/Makefile:1.1 Sun Jan 22 03:53:32 2012
+++ src/distrib/vax/liveimage/emuimage/Makefile Fri Aug 17 16:56:36 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.2 2012/08/17 16:56:36 riz Exp $
+
+LIVEIMGBASE= NetBSD-${DISTRIBVER}-vax-live-ra0root # gives ${IMGBASE}.img
.include <bsd.own.mk>
