svn commit: r259225 - in stable/10: release share/man/man7

[Glen Barber]

Author: gjb
Date: Wed Dec 11 19:26:56 2013
New Revision: 259225
URL: http://svnweb.freebsd.org/changeset/base/259225

Log:
  MFC r257805, r257806, r257807, r257942:
  
  r257805:
    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.
  
  r257806:
    Remove extra target from 'memstick' that I forgot to remove before
    previous commit.
  
  r257807:
    Update release(7) to include 'mini-memstick'.
  
  r257942:
    Fix a few style nits.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/Makefile
  stable/10/release/release.sh
  stable/10/share/man/man7/release.7
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/release/Makefile
==============================================================================
--- stable/10/release/Makefile	Wed Dec 11 19:25:38 2013	(r259224)
+++ stable/10/release/Makefile	Wed Dec 11 19:26:56 2013	(r259225)
@@ -6,6 +6,7 @@
 #  cdrom: Builds release CD-ROM media (disc1.iso)
 #  dvdrom: Builds release DVD-ROM media (dvd1.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}
@@ -84,7 +85,9 @@ IMAGES+=	dvd1.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
 
 CLEANFILES=	packagesystem *.txz MANIFEST system ${IMAGES}
@@ -208,6 +211,10 @@ memstick: 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}

Modified: stable/10/release/release.sh
==============================================================================
--- stable/10/release/release.sh	Wed Dec 11 19:25:38 2013	(r259224)
+++ stable/10/release/release.sh	Wed Dec 11 19:26:56 2013	(r259225)
@@ -111,10 +111,10 @@ fi
 # instead of their values.
 DOCPORTS=
 if [ "x${NOPORTS}" != "x" ]; then
- DOCPORTS="NOPORTS=yes "
+	DOCPORTS="NOPORTS=yes "
 fi
 if [ "x${NODOC}" != "x" ]; then
- DOCPORTS="${DOCPORTS}NODOC=yes"
+	DOCPORTS="${DOCPORTS}NODOC=yes"
 fi
 
 # The aggregated build-time flags based upon variables defined within
@@ -137,7 +137,7 @@ RELEASE_RMAKEFLAGS="${ARCH_FLAGS} KERNCO
 # Force src checkout if configured
 FORCE_SRC_KEY=
 if [ "x${SRC_FORCE_CHECKOUT}" != "x" ]; then
- FORCE_SRC_KEY="--force"
+	FORCE_SRC_KEY="--force"
 fi
 
 if [ ! ${CHROOTDIR} ]; then

Modified: stable/10/share/man/man7/release.7
==============================================================================
--- stable/10/share/man/man7/release.7	Wed Dec 11 19:25:38 2013	(r259224)
+++ stable/10/share/man/man7/release.7	Wed Dec 11 19:26:56 2013	(r259225)
@@ -292,6 +292,11 @@ Requires that the
 .Pq memory disk
 device driver be present in the kernel
 .Pq either by being compiled in or available as a module .
+.It Cm mini-memstick
+Similar to
+.Cm memstick ,
+with the exception that the installation distribution sets
+are not included.
 .It Cm ftp
 Creates a directory named
 .Pa ftp