svn commit: r257805 - head/release

[Glen Barber]

Author: gjb
Date: Thu Nov  7 18:53:55 2013
New Revision: 257805
URL: http://svnweb.freebsd.org/changeset/base/257805

Log:
  Add a 'mini-memstick.img' release target, which will use the
  'bootonly.iso' components to create a smaller memory stick image.
  
  This is useful for system recovery, where a full memstick.img image
  is not necessarily needed (or wanted).  In addition, it is possible to
  do bootonly-style installation, where the base.txz, kernel.txz, etc.
  are fetched from a remote source.
  
  Provide backwards-compatible target (mini-memstick), to keep in sync
  with the targets documented in release/Makefile.
  
  Prompted by:	wblock
  MFC after:	1 week
  X-MFC-after:	10.0-RELEASE
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/Makefile

Modified: head/release/Makefile
==============================================================================
--- head/release/Makefile	Thu Nov  7 18:50:11 2013	(r257804)
+++ head/release/Makefile	Thu Nov  7 18:53:55 2013	(r257805)
@@ -5,6 +5,7 @@
 # User-driven targets:
 #  cdrom: Builds release CD-ROM media (disc1.iso)
 #  memstick: Builds memory stick image (memstick.img)
+#  mini-memstick: Builds minimal memory stick image (mini-memstick.img)
 #  ftp: Sets up FTP distribution area (ftp)
 #  release: Build all media and FTP distribution area
 #  install: Copies all release media into ${DESTDIR}
@@ -74,7 +75,9 @@ IMAGES+=	disc1.iso bootonly.iso
 .endif
 .if exists(${.CURDIR}/${TARGET}/make-memstick.sh)
 RELEASE_TARGETS+= memstick.img
+RELEASE_TARGETS+= mini-memstick.img
 IMAGES+=	memstick.img
+IMAGES+=	mini-memstick.img
 .endif
 
 .include <bsd.obj.mk>
@@ -168,10 +171,14 @@ disc1.iso: system
 bootonly.iso: bootonly
 	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} bootonly
 
-memstick: memstick.img
+memstick: memstick.img mini-memstick.img
 memstick.img: system
 	sh ${.CURDIR}/${TARGET}/make-memstick.sh release ${.TARGET}
 
+mini-memstick: mini-memstick.img
+mini-memstick.img: system
+	sh ${.CURDIR}/${TARGET}/make-memstick.sh bootonly ${.TARGET}
+
 packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES}
 	sh ${.CURDIR}/scripts/make-manifest.sh *.txz > MANIFEST
 	touch ${.TARGET}