Sorry for doing this backwards, but as with most release related stuff
we only pay attention to it during release time and at the moment it's a -stable release in progress. This is a MFS I guess, moving rev 1.536.2.113 to HEAD. I ran out of time to follow through with doing this last night. Sorry for the delay. Adding a couple of variables to make tweaking the CD-ROM label and .iso filenames easier.
This commit is contained in:
parent
7737867170
commit
4f27387d5c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=128755
@ -115,6 +115,12 @@ DOMINIMALDOCPORTS= YES
|
||||
RELEASEPORTSMODULE= ${MINIMALDOCPORTS}
|
||||
.endif
|
||||
|
||||
# Make changing names of disc1/disc2 CD's possible.
|
||||
DISC1_LABEL?= fbsd_miniinst
|
||||
DISC1_NAME?= miniinst
|
||||
DISC2_LABEL?= fbsd_livefs
|
||||
DISC2_NAME?= disc2
|
||||
|
||||
# Helper variable
|
||||
.if defined(NOPORTS)
|
||||
.if !defined(DOMINIMALDOCPORTS) || ${DOMINIMALDOCPORTS} != "YES"
|
||||
@ -416,6 +422,10 @@ release rerelease:
|
||||
BOOT_CONFIG \
|
||||
BUILDNAME \
|
||||
CD_EXTRA_BITS \
|
||||
DISC1_LABEL \
|
||||
DISC1_NAME \
|
||||
DISC2_LABEL \
|
||||
DISC2_NAME \
|
||||
DISTRIBUTIONS \
|
||||
DOC_LANG \
|
||||
DOMINIMALDOCPORTS \
|
||||
@ -925,11 +935,11 @@ iso.1:
|
||||
${CD}/${BUILDNAME}-${TARGET}-bootonly.iso ${CD_BOOT}
|
||||
.endif
|
||||
@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
|
||||
fbsd_miniinst \
|
||||
${CD}/${BUILDNAME}-${TARGET}-miniinst.iso ${CD_DISC1}
|
||||
${DISC1_LABEL} \
|
||||
${CD}/${BUILDNAME}-${TARGET}-${DISC1_NAME}.iso ${CD_DISC1}
|
||||
@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
|
||||
fbsd_livefs \
|
||||
${CD}/${BUILDNAME}-${TARGET}-disc2.iso ${CD_DISC2}
|
||||
${DISC2_LABEL} \
|
||||
${CD}/${BUILDNAME}-${TARGET}-${DISC2_NAME}.iso ${CD_DISC2}
|
||||
.if defined(CD_EXTRA_BITS)
|
||||
@sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
|
||||
fbsd_boot \
|
||||
|
@ -283,6 +283,22 @@ environment immediately after any local patches are applied.
|
||||
.It Va MAKE_ISOS
|
||||
If defined, bootable ISO CD-ROM images will be created from the
|
||||
contents of the CD-ROM stage directory.
|
||||
.It Va DISC1_LABEL
|
||||
The label used for the CD-ROM created from the disc1 contents, the
|
||||
default label will be
|
||||
.Dq fbsd_miniinst .
|
||||
.It Va DISC1_NAME
|
||||
The name used as part of the ISO file name for the CD-ROM created from
|
||||
the disc1 contents, the default will be
|
||||
.Dq miniinst .
|
||||
.It Va DISC2_LABEL
|
||||
The label used for the CD-ROM created from the disc2 contents, the
|
||||
default label will be
|
||||
.Dq fbsd_livefs .
|
||||
.It Va DISC2_NAME
|
||||
The name used as part of the ISO file name for the CD-ROM created from
|
||||
the disc2 contents, the default will be
|
||||
.Dq disc2 .
|
||||
.It Va NOCDROM
|
||||
If defined, the CD-ROM stage directories will not be created.
|
||||
.It Va NODOC
|
||||
|
Loading…
Reference in New Issue
Block a user