diff options
Diffstat (limited to 'distrib/amd64/iso/Makefile')
| -rw-r--r-- | distrib/amd64/iso/Makefile | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/distrib/amd64/iso/Makefile b/distrib/amd64/iso/Makefile index ea7fe63616a..f75dd614a4c 100644 --- a/distrib/amd64/iso/Makefile +++ b/distrib/amd64/iso/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.28 2019/04/29 15:56:25 deraadt Exp $ - -CDROM= install${OSrev}.iso +# $OpenBSD: Makefile,v 1.29 2019/04/30 17:46:03 deraadt Exp $ FS= install${OSrev}.fs FSSIZE= 921536 FSTYPE= install360 +CDROM= install${OSrev}.iso MOUNT_POINT= /mnt MTREE= ${UTILS}/mtree.conf @@ -20,7 +19,6 @@ BASE= ${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \ XBASE= ${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xfont${OSrev}.tgz \ ${RELXDIR}/xshare${OSrev}.tgz ${RELXDIR}/xserv${OSrev}.tgz -BOOT?= ${DESTDIR}/usr/mdec/boot EFIBOOT?= ${DESTDIR}/usr/mdec/BOOTX64.EFI ${DESTDIR}/usr/mdec/BOOTIA32.EFI MSDOSSIZE= 960 TOTALSIZE!= expr ${FSSIZE} + ${MSDOSSIZE} @@ -44,7 +42,7 @@ ${FS}: ${BASE} ${XBASE} bsd.gz .endif newfs -m 0 -o space -i 524288 -c ${FSSIZE} /dev/r`cat vnd`a mount /dev/`cat vnd`a ${MOUNT_POINT} - cp ${BOOT} ${MOUNT_POINT}/boot + cp ${DESTDIR}/usr/mdec/boot ${MOUNT_POINT}/boot strip ${MOUNT_POINT}/boot strip -R .comment -R .SUNW_ctf ${MOUNT_POINT}/boot dd if=bsd.gz of=${MOUNT_POINT}/bsd bs=512 @@ -66,7 +64,7 @@ ${FS}: ${BASE} ${XBASE} bsd.gz rm -f vnd ${CDROM}: ${BASE} ${XBASE} - -rm -rf ${.OBJDIR}/cd-dir + rm -rf ${.OBJDIR}/cd-dir mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE} mkdir -p ${.OBJDIR}/cd-dir/etc echo "set image /${OSREV}/${MACHINE}/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf @@ -106,4 +104,3 @@ bsd.rd: ${BSDRD} cp ${BSDRD} bsd.rd .include <bsd.obj.mk> -.include <bsd.subdir.mk> |