Add ${BUILDNAME} and ${TARGET} to the filenames of ISO images
generated during release builds. For the most part, re@ was doing this manually before putting ISO images on ftp-master, but not always. This should make naming more consistent and descriptive. Requested by: jason andrade <jason@dstc.edu.au>, hubs@ Approved by: re (rwatson) MFC after: 1 month
This commit is contained in:
parent
eba0370d90
commit
e27933a498
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=107732
@ -892,12 +892,12 @@ iso.1:
|
||||
@if [ -r ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ]; then \
|
||||
echo "Creating ISO images..."; \
|
||||
sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
|
||||
fbsd_miniinst ${CD}/miniinst.iso ${CD_DISC1}; \
|
||||
fbsd_miniinst ${CD}/${BUILDNAME}-${TARGET}-miniinst.iso ${CD_DISC1}; \
|
||||
sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
|
||||
fbsd_livefs ${CD}/disc2.iso ${CD_DISC2}; \
|
||||
fbsd_livefs ${CD}/${BUILDNAME}-${TARGET}-disc2.iso ${CD_DISC2}; \
|
||||
if [ "x${CD_EXTRA_BITS}" != "x" ]; then \
|
||||
sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \
|
||||
fbsd_boot ${CD}/disc1.iso ${CD_DISC1} ${CD_EXTRA_BITS} \
|
||||
fbsd_boot ${CD}/${BUILDNAME}-${TARGET}-disc1.iso ${CD_DISC1} ${CD_EXTRA_BITS} \
|
||||
&& false; \
|
||||
fi \
|
||||
else \
|
||||
|
Loading…
Reference in New Issue
Block a user