Date: Fri, 11 Sep 2015 21:45:41 +0000 (UTC) From: Devin Teske <dteske@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r287696 - head/release Message-ID: <201509112145.t8BLjfkJ061990@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dteske Date: Fri Sep 11 21:45:41 2015 New Revision: 287696 URL: https://svnweb.freebsd.org/changeset/base/287696 Log: The <arch>/mkisoimages.sh script in release knows how to add extra bits from an "xtra-bits-dir". This feature is unusable from release/Makefile. Add an XTRADIR setting to use it. Differential Revision: https://reviews.freebsd.org/D3633 Reviewed by: kmacy MFC after: 3 weeks X-MFC-to: stable/10 Relnotes: yes Modified: head/release/Makefile Modified: head/release/Makefile ============================================================================== --- head/release/Makefile Fri Sep 11 21:18:21 2015 (r287695) +++ head/release/Makefile Fri Sep 11 21:45:41 2015 (r287696) @@ -21,6 +21,7 @@ # (by default, the directory above this one) # PORTSDIR: location of ports tree to distribute (default: /usr/ports) # DOCDIR: location of doc tree (default: /usr/doc) +# XTRADIR: xtra-bits-dir argument for <arch>/mkisoimages.sh # NOPKG: if set, do not distribute third-party packages # NOPORTS: if set, do not distribute ports tree # NOSRC: if set, do not distribute source tree @@ -242,13 +243,13 @@ dvd: packagesystem release.iso: disc1.iso disc1.iso: disc1 - sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_CD ${.TARGET} disc1 + sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_CD ${.TARGET} disc1 ${XTRADIR} dvd1.iso: dvd pkg-stage - sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_DVD ${.TARGET} dvd + sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_DVD ${.TARGET} dvd ${XTRADIR} bootonly.iso: bootonly - sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_BO ${.TARGET} bootonly + sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b ${VOLUME_LABEL}_BO ${.TARGET} bootonly ${XTRADIR} memstick: memstick.img memstick.img: disc1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509112145.t8BLjfkJ061990>