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
This commit is contained in:
Glen Barber 2014-04-02 16:53:07 +00:00
parent 14a7e8f167
commit 55af5cf123
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=264046
2 changed files with 5 additions and 5 deletions

View File

@ -21,7 +21,7 @@
# NOSRC: if set, do not distribute source tree # NOSRC: if set, do not distribute source tree
# NODOC: if set, do not generate release documentation # NODOC: if set, do not generate release documentation
# WITH_DVD: if set, generate dvd1.iso # 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) # (uncompressed images are not removed)
# TARGET/TARGET_ARCH: architecture of built release # TARGET/TARGET_ARCH: architecture of built release
# #
@ -96,7 +96,7 @@ IMAGES+= mini-memstick.img
CLEANFILES= packagesystem *.txz MANIFEST system ${IMAGES} CLEANFILES= packagesystem *.txz MANIFEST system ${IMAGES}
.if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES) .if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES)
. for I in ${IMAGES} . for I in ${IMAGES}
CLEANFILES+= ${I}.gz CLEANFILES+= ${I}.xz
. endfor . endfor
.endif .endif
CLEANDIRS= dist ftp release bootonly dvd CLEANDIRS= dist ftp release bootonly dvd
@ -259,7 +259,7 @@ install:
.for I in ${IMAGES} .for I in ${IMAGES}
cp -p ${I} ${DESTDIR}/${OSRELEASE}-${I} cp -p ${I} ${DESTDIR}/${OSRELEASE}-${I}
. if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES) . if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES)
gzip -k ${DESTDIR}/${OSRELEASE}-${I} xz -k ${DESTDIR}/${OSRELEASE}-${I}
. endif . endif
.endfor .endfor
cd ${DESTDIR} && sha256 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA256 cd ${DESTDIR} && sha256 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA256

View File

@ -24,7 +24,7 @@
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd March 5, 2014 .Dd April 2, 2014
.Dt RELEASE 7 .Dt RELEASE 7
.Os .Os
.Sh NAME .Sh NAME
@ -252,7 +252,7 @@ Set to a non-empty value to include the
target. target.
.It Va WITH_COMPRESSED_IMAGES .It Va WITH_COMPRESSED_IMAGES
Set to a non-empty value to compress the release images with Set to a non-empty value to compress the release images with
.Xr gzip 1 . .Xr xz 1 .
The original The original
.Pq uncompressed .Pq uncompressed
images are not removed. images are not removed.