aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2013-07-22 12:07:57 +0000
committerGlen Barber <gjb@FreeBSD.org>2013-07-22 12:07:57 +0000
commit8cec99b682320acbfd0d50331f20df5021afbc1a (patch)
treeb4077e4a34185ae631c800c1a6a4e6c33b7bfe0e /release/Makefile
parented2661f5a297571b8031d3e6cf4925c8d297f798 (diff)
downloadsrc-8cec99b682320acbfd0d50331f20df5021afbc1a.tar.gz
src-8cec99b682320acbfd0d50331f20df5021afbc1a.zip
For consistency with previous releases, name the cdrom install
cd 'disc1.iso'. Discussed with: re@ team Approved by: kib (mentor) MFC after: 3 days X-MFC-To: stable/9 only
Notes
Notes: svn path=/head/; revision=253542
Diffstat (limited to 'release/Makefile')
-rw-r--r--release/Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/release/Makefile b/release/Makefile
index ec92886e6859..ffe78b0fe673 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -3,7 +3,7 @@
# Makefile for building releases and release media.
#
# User-driven targets:
-# cdrom: Builds release CD-ROM media (release.iso)
+# cdrom: Builds release CD-ROM media (disc1.iso)
# memstick: Builds memory stick image (memstick.img)
# ftp: Sets up FTP distribution area (ftp)
# release: Build all media and FTP distribution area
@@ -70,7 +70,7 @@ RELEASE_TARGETS= ftp
IMAGES=
.if exists(${.CURDIR}/${TARGET}/mkisoimages.sh)
RELEASE_TARGETS+= cdrom
-IMAGES+= release.iso bootonly.iso
+IMAGES+= disc1.iso bootonly.iso
.endif
.if exists(${.CURDIR}/${TARGET}/make-memstick.sh)
RELEASE_TARGETS+= memstick.img
@@ -161,7 +161,8 @@ bootonly: packagesystem
echo hostid_enable=\"NO\" >> bootonly/etc/rc.conf
cp ${.CURDIR}/rc.local bootonly/etc
-release.iso: system
+release.iso: disc1.iso
+disc1.iso: system
sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} release
bootonly.iso: bootonly
@@ -175,7 +176,7 @@ packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES}
sh ${.CURDIR}/scripts/make-manifest.sh *.txz > MANIFEST
touch ${.TARGET}
-cdrom: release.iso bootonly.iso
+cdrom: disc1.iso bootonly.iso
ftp: packagesystem
rm -rf ftp
mkdir -p ftp
@@ -192,7 +193,7 @@ clean:
rm -f *.txz MANIFEST
rm -f system
rm -rf release bootonly
- rm -f release.iso bootonly.iso memstick.img
+ rm -f disc1.iso bootonly.iso memstick.img
install:
.if defined(DESTDIR) && !empty(DESTDIR)