From owner-svn-src-head@FreeBSD.ORG Wed Apr 2 16:53:08 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B0D373A4; Wed, 2 Apr 2014 16:53:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 84107AFE; Wed, 2 Apr 2014 16:53:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s32Gr8P3071607; Wed, 2 Apr 2014 16:53:08 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s32Gr8nl071605; Wed, 2 Apr 2014 16:53:08 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201404021653.s32Gr8nl071605@svn.freebsd.org> From: Glen Barber Date: Wed, 2 Apr 2014 16:53:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r264046 - in head: release share/man/man7 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Apr 2014 16:53:08 -0000 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.