diff options
| author | dteske <dteske@FreeBSD.org> | 2015-11-02 21:46:58 +0000 |
|---|---|---|
| committer | dteske <dteske@FreeBSD.org> | 2015-11-02 21:46:58 +0000 |
| commit | 1e61126a7687bb63c6568ee626b07dca02e6450e (patch) | |
| tree | bc74fa2163f7e67dc268ee136bf4412d7e299629 /release | |
| parent | c9f6dc2e04930a78942c3d8f8bf157900216ff08 (diff) | |
| download | FreeBSD-src-1e61126a7687bb63c6568ee626b07dca02e6450e.zip FreeBSD-src-1e61126a7687bb63c6568ee626b07dca02e6450e.tar.gz | |
MFC r287696:
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.
MFC r287697: Whitespace alignment
Differential Revision: https://reviews.freebsd.org/D3633
Reviewed by: kmacy
Relnotes: yes
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/release/Makefile b/release/Makefile index 6e522e4..4cd82c3 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 @@ -248,7 +249,7 @@ 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} uefi-disc1.iso: disc1 .if exists(${.CURDIR}/${TARGET}/mkisoimages-uefi.sh) @@ -263,7 +264,7 @@ uefi-bootonly.iso: bootonly .endif 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} uefi-dvd1.iso: dvd pkg-stage .if exists(${.CURDIR}/${TARGET}/mkisoimages-uefi.sh) @@ -272,7 +273,7 @@ uefi-dvd1.iso: dvd pkg-stage .endif 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 |
