Module Name: src
Committed By: snj
Date: Wed Nov 5 08:19:17 UTC 2014
Modified Files:
src: Makefile build.sh
Log Message:
iso -> images
To generate a diff of this commit:
cvs rdiff -u -r1.310 -r1.311 src/Makefile
cvs rdiff -u -r1.298 -r1.299 src/build.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/Makefile
diff -u src/Makefile:1.310 src/Makefile:1.311
--- src/Makefile:1.310 Mon Aug 18 07:52:40 2014
+++ src/Makefile Wed Nov 5 08:19:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.310 2014/08/18 07:52:40 plunky Exp $
+# $NetBSD: Makefile,v 1.311 2014/11/05 08:19:17 snj Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -64,11 +64,11 @@
# Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs
# from ${DESTDIR}
# iso-image:
-# Create CD-ROM image in RELEASEDIR/iso.
+# Create CD-ROM image in RELEASEDIR/images.
# RELEASEDIR must already have been populated by `make release'
# or equivalent.
# iso-image-source:
-# Create CD-ROM image with source in RELEASEDIR/iso.
+# Create CD-ROM image with source in RELEASEDIR/images.
# RELEASEDIR must already have been populated by
# `make release sourcesets' or equivalent.
# live-image:
Index: src/build.sh
diff -u src/build.sh:1.298 src/build.sh:1.299
--- src/build.sh:1.298 Tue Sep 30 14:57:51 2014
+++ src/build.sh Wed Nov 5 08:19:17 2014
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.298 2014/09/30 14:57:51 apb Exp $
+# $NetBSD: build.sh,v 1.299 2014/11/05 08:19:17 snj Exp $
#
# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1037,8 +1037,8 @@ Usage: ${progname} [-EhnorUuxy] [-a arch
sourcesets Create source sets in RELEASEDIR/source/sets.
syspkgs Create syspkgs in
RELEASEDIR/RELEASEMACHINEDIR/binary/syspkgs.
- iso-image Create CD-ROM image in RELEASEDIR/iso.
- iso-image-source Create CD-ROM image with source in RELEASEDIR/iso.
+ iso-image Create CD-ROM image in RELEASEDIR/images.
+ iso-image-source Create CD-ROM image with source in RELEASEDIR/images.
live-image Create bootable live image in
RELEASEDIR/RELEASEMACHINEDIR/installation/liveimage.
install-image Create bootable installation image in
@@ -1870,7 +1870,7 @@ createmakewrapper()
eval cat <<EOF ${makewrapout}
#! ${HOST_SH}
# Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from: \$NetBSD: build.sh,v 1.298 2014/09/30 14:57:51 apb Exp $
+# Generated from: \$NetBSD: build.sh,v 1.299 2014/11/05 08:19:17 snj Exp $
# with these arguments: ${_args}
#