Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 Apr 2014 12:04:05 +0000 (UTC)
From:      Glen Barber <gjb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r264073 - head/release
Message-ID:  <201404031204.s33C457O059224@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gjb
Date: Thu Apr  3 12:04:05 2014
New Revision: 264073
URL: http://svnweb.freebsd.org/changeset/base/264073

Log:
  Allow overriding xz(1) path.
  
  Requested by:	marck
  MFC After:	5 days
  X-MFC-With:	r264027,r264028,r264029,r264030,r264046
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/Makefile

Modified: head/release/Makefile
==============================================================================
--- head/release/Makefile	Thu Apr  3 12:03:30 2014	(r264072)
+++ head/release/Makefile	Thu Apr  3 12:04:05 2014	(r264073)
@@ -30,6 +30,7 @@ WORLDDIR?=	${.CURDIR}/..
 PORTSDIR?=	/usr/ports
 DOCDIR?=	/usr/doc
 RELNOTES_LANG?= en_US.ISO8859-1
+XZCMD?=		/usr/bin/xz
 
 .if !defined(TARGET) || empty(TARGET)
 TARGET=		${MACHINE}
@@ -259,7 +260,7 @@ install:
 .for I in ${IMAGES}
 	cp -p ${I} ${DESTDIR}/${OSRELEASE}-${I}
 . if defined(WITH_COMPRESSED_IMAGES) && !empty(WITH_COMPRESSED_IMAGES)
-	xz -k ${DESTDIR}/${OSRELEASE}-${I}
+	${XZCMD} -k ${DESTDIR}/${OSRELEASE}-${I}
 . endif
 .endfor
 	cd ${DESTDIR} && sha256 ${OSRELEASE}* > ${DESTDIR}/CHECKSUM.SHA256



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404031204.s33C457O059224>