d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r287696:

Browse Source 
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
This commit is contained in:
dteske 2015-11-02 21:46:58 +00:00
parent c9f6dc2e04
commit 1e61126a76
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
release/Makefile
View File

@ -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