Browse files

MFC r253513, r253542:

r253513:
 Create memstick images with the '.img' filename extension.

r253542:
 For consistency with previous releases, name the cdrom install
 cd 'disc1.iso'.

Approved by:	kib (mentor)
Approved by:	re (marius)
  • Loading branch information...
1 parent e2fe218 commit 4626acf1e11f16058636d7c68b2422e1a2b72da2 gjb committed Jul 25, 2013
Showing with 11 additions and 9 deletions.
  1. +11 −9 release/Makefile
View
20 release/Makefile
@@ -3,8 +3,8 @@
# Makefile for building releases and release media.
#
# User-driven targets:
-# cdrom: Builds release CD-ROM media (release.iso)
-# memstick: Builds memory stick image (memstick)
+# 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
# install: Copies all release media into ${DESTDIR}
@@ -70,11 +70,11 @@ 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
-IMAGES+= memstick
+RELEASE_TARGETS+= memstick.img
+IMAGES+= memstick.img
.endif
.include <bsd.obj.mk>
@@ -165,7 +165,8 @@ release/cdrom.inf: system
echo "CD_VERSION = ${REVISION}-${BRANCH}" > ${.TARGET}
echo "CD_VOLUME = 1" >> ${.TARGET}
-release.iso: system release/cdrom.inf
+release.iso: disc1.iso
+disc1.iso: system release/cdrom.inf
sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} release
bootonly/cdrom.inf: bootonly
@@ -175,14 +176,15 @@ bootonly/cdrom.inf: bootonly
bootonly.iso: bootonly bootonly/cdrom.inf
sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} bootonly
-memstick: system
+memstick: memstick.img
+memstick.img: system
sh ${.CURDIR}/${TARGET}/make-memstick.sh release ${.TARGET}
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
@@ -199,7 +201,7 @@ clean:
rm -f *.txz MANIFEST
rm -f system
rm -rf release bootonly
- rm -f release.iso bootonly.iso memstick
+ rm -f disc1.iso bootonly.iso memstick.img
install:
.if defined(DESTDIR) && !empty(DESTDIR)

0 comments on commit 4626acf

Please sign in to comment.