diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-04-30 17:46:07 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-04-30 17:46:07 +0000 |
| commit | d3aa0d760e1ed38557b0c9da42407fc9ad97d828 (patch) | |
| tree | 2dec49beadb3ffe5f5334cd98424fbbab5ba000e /distrib/sparc64/iso | |
| parent | 7f1a8bec460a41a172fb21ffab33697ce8395c12 (diff) | |
Every Makefile on every architecture had deviated in unique ways.
Eliminate many more differences. When it makes sense, build bsd.rd
and miniroot/ramdisk.fs and cd.iso in the same directory. More steps
coming after this..
Diffstat (limited to 'distrib/sparc64/iso')
| -rw-r--r-- | distrib/sparc64/iso/Makefile | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/distrib/sparc64/iso/Makefile b/distrib/sparc64/iso/Makefile index 55945ebd099..b418f71dfbd 100644 --- a/distrib/sparc64/iso/Makefile +++ b/distrib/sparc64/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2019/04/29 15:56:26 deraadt Exp $ +# $OpenBSD: Makefile,v 1.20 2019/04/30 17:46:05 deraadt Exp $ CDROM= install${OSrev}.iso RELXDIR?= /home/relx-${MACHINE} @@ -14,8 +14,8 @@ XBASE= ${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xfont${OSrev}.tgz \ all: ${CDROM} ${CDROM}: ${BASE} ${XBASE} - -rm -rf ${.OBJDIR}/cd-dir - -mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE} + rm -rf ${.OBJDIR}/cd-dir/ + mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE} cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE} cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE} @@ -45,6 +45,10 @@ ${CDROM}: ${BASE} ${XBASE} rm -f vnd mksuncd f ${.OBJDIR}/${CDROM} ${.OBJDIR}/../miniroot/miniroot${OSrev}.fs +unconfig: + -umount -f ${MOUNT_POINT} + -[ -f vnd ] && vnconfig -u `cat vnd` && rm -f vnd + install: cp ${CDROM} ${RELDIR}/ @@ -52,4 +56,3 @@ clean cleandir: /bin/rm -rf ${CDROM} ${.OBJDIR}/cd-dir .include <bsd.obj.mk> -.include <bsd.subdir.mk> |