Set a BOOTABLE variable to "-b" if MACHINE is not pc98, and use it for
mkisoimages.sh instead of "-b" directly. MFC after: 1 week
This commit is contained in:
parent
1699365d1a
commit
29921a60d7
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=86887
@ -221,6 +221,9 @@ CRUNCH_TARGETS= boot fixit
|
||||
EXTRAS= cdrom.1 ftp.1
|
||||
.if defined(MAKE_ISOS)
|
||||
EXTRAS+= iso.1
|
||||
.if ${MACHINE} != "pc98"
|
||||
BOOTABLE="-b"
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if !defined(NODOC)
|
||||
@ -784,13 +787,13 @@ cdrom.1:
|
||||
iso.1:
|
||||
@if [ -r ${.CURDIR}/${MACHINE_ARCH}/mkisoimages.sh ]; then \
|
||||
echo "Creating ISO images..."; \
|
||||
sh ${.CURDIR}/${MACHINE_ARCH}/mkisoimages.sh -b fbsd_miniinst \
|
||||
${CD}/miniinst.iso ${CD_DISC1}; \
|
||||
sh ${.CURDIR}/${MACHINE_ARCH}/mkisoimages.sh -b fbsd_livefs \
|
||||
${CD}/disc2.iso ${CD_DISC2}; \
|
||||
sh ${.CURDIR}/${MACHINE_ARCH}/mkisoimages.sh ${BOOTABLE} \
|
||||
fbsd_miniinst ${CD}/miniinst.iso ${CD_DISC1}; \
|
||||
sh ${.CURDIR}/${MACHINE_ARCH}/mkisoimages.sh ${BOOTABLE} \
|
||||
fbsd_livefs ${CD}/disc2.iso ${CD_DISC2}; \
|
||||
if [ "x${CD_EXTRA_BITS}" != "x" ]; then \
|
||||
sh ${.CURDIR}/${MACHINE_ARCH}/mkisoimages.sh -b fbsd_boot \
|
||||
${CD}/disc1.iso ${CD_DISC1} ${CD_EXTRA_BITS}; \
|
||||
sh ${.CURDIR}/${MACHINE_ARCH}/mkisoimages.sh ${BOOTABLE} \
|
||||
fbsd_boot ${CD}/disc1.iso ${CD_DISC1} ${CD_EXTRA_BITS}; \
|
||||
&& false; \
|
||||
fi \
|
||||
else \
|
||||
|
Loading…
Reference in New Issue
Block a user