svn commit: r264046 - in head: release share/man/man7

[Glen Barber]

Author: gjb
Date: Wed Apr  2 16:53:07 2014
New Revision: 264046
URL: http://svnweb.freebsd.org/changeset/base/264046

Log:
  Use xz(1) instead of gzip(1) to compress release images
  when WITH_COMPRESSED_IMAGES is used.
  
  Requested by:	delphij, brooks, Nikolai Lifanov
  MFC After:	1 week
  X-MFC-With:	r264027,r264028,r264029,r264030
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/Makefile
  head/share/man/man7/release.7

Modified: head/release/Makefile
==============================================================================
--- head/release/Makefile	Wed Apr  2 16:33:10 2014	(r264045)
+++ head/release/Makefile	Wed Apr  2 16:53:07 2014	(r264046)
@@ -21,7 +21,7 @@
 #  NOSRC:    if set, do not distribute source tree
 #  NODOC:    if set, do not generate release documentation
 #  WITH_DVD: if set, generate dvd1.iso
-#  WITH_COMPRESSED_IMAGES: if set, compress installation images with gzip(1)
+#  WITH_COMPRESSED_IMAGES: if set, compress installation images with xz(1)
 #		(uncompressed images are not removed)
 #  TARGET/TARGET_ARCH: architecture of built release
 #
@@ -96,7 +96,7 @@ IMAGES+=	mini-memstick.img
 CLEANFILES=	packagesystem *.txz MANIFEST system ${IMAGES}
 .if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES)
 . for I in ${IMAGES}
-CLEANFILES+=	${I}.gz
+CLEANFILES+=	${I}.xz
 . endfor
 .endif
 CLEANDIRS=	dist ftp release bootonly dvd
@@ -259,7 +259,7 @@ install:
 .for I in ${IMAGES}
 	cp -p ${I} ${DESTDIR}/${OSRELEASE}-${I}
 . if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES)
-	gzip -k ${DESTDIR}/${OSRELEASE}-${I}
+	xz -k ${DESTDIR}/${OSRELEASE}-${I}
 . endif
 .endfor
 	cd ${DESTDIR} && sha256 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA256

Modified: head/share/man/man7/release.7
==============================================================================
--- head/share/man/man7/release.7	Wed Apr  2 16:33:10 2014	(r264045)
+++ head/share/man/man7/release.7	Wed Apr  2 16:53:07 2014	(r264046)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 5, 2014
+.Dd April 2, 2014
 .Dt RELEASE 7
 .Os
 .Sh NAME
@@ -252,7 +252,7 @@ Set to a non-empty value to include the
 target.
 .It Va WITH_COMPRESSED_IMAGES
 Set to a non-empty value to compress the release images with
-.Xr gzip 1 .
+.Xr xz 1 .
 The original
 .Pq uncompressed
 images are not removed.