aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile
diff options
context:
space:
mode:
authorDevin Teske <dteske@FreeBSD.org>2015-09-11 21:45:41 +0000
committerDevin Teske <dteske@FreeBSD.org>2015-09-11 21:45:41 +0000
commit1b8a3e1db273ab946e4446c871163262e3f2db81 (patch)
treec32d57b8c29d4b5e73d7bed51b3fd620ce909a35 /release/Makefile
parent65f3614085feaa5731f12b8217040cd15cbfe7f2 (diff)
downloadsrc-1b8a3e1db273ab946e4446c871163262e3f2db81.tar.gz
src-1b8a3e1db273ab946e4446c871163262e3f2db81.zip
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
Notes
Notes: svn path=/head/; revision=287696
Diffstat (limited to 'release/Makefile')
-rw-r--r--release/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/release/Makefile b/release/Makefile
index e3485f222ad5..37db800566a7 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -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