summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2013-07-21 05:23:34 +0000
committergjb <gjb@FreeBSD.org>2013-07-21 05:23:34 +0000
commit25c503b103d90a6d11bbe3e2f2f7b0df36f5b381 (patch)
tree76d309bbd46b7c91f3c7b010074c1bac334bcd5b
parenta79d339a88fd53d001f3f0bf9b431a8c3089721e (diff)
downloadFreeBSD-src-25c503b103d90a6d11bbe3e2f2f7b0df36f5b381.zip
FreeBSD-src-25c503b103d90a6d11bbe3e2f2f7b0df36f5b381.tar.gz
Create memstick images with the '.img' filename extension.
Requested by: many Approved by: kib (mentor) MFC after: 3 days X-MFC-To: stable/9 only
-rw-r--r--release/Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/release/Makefile b/release/Makefile
index 1222647..ec92886 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -4,7 +4,7 @@
#
# User-driven targets:
# cdrom: Builds release CD-ROM media (release.iso)
-# memstick: Builds memory stick image (memstick)
+# 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}
@@ -73,8 +73,8 @@ RELEASE_TARGETS+= cdrom
IMAGES+= release.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>
@@ -167,7 +167,8 @@ release.iso: system
bootonly.iso: bootonly
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}
@@ -191,7 +192,7 @@ clean:
rm -f *.txz MANIFEST
rm -f system
rm -rf release bootonly
- rm -f release.iso bootonly.iso memstick
+ rm -f release.iso bootonly.iso memstick.img
install:
.if defined(DESTDIR) && !empty(DESTDIR)
OpenPOWER on IntegriCloud