diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-05-03 20:04:00 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-05-03 20:04:00 +0000 |
| commit | f4d1d40f84c06cfca32e8a6713275b7561d2c0d4 (patch) | |
| tree | 3554042028da01bab315c7e330c123ff1f6c1b44 /distrib/sgi | |
| parent | 5dea246e02f9e7cb55b01c138de3fbe57bb27664 (diff) | |
Further removal of differences (using install instead of cp, sorting
chunks in a specified order, using a few variables, performing bsd.rd
to bsd.gz conversion as similar as possible)
Diffstat (limited to 'distrib/sgi')
| -rw-r--r-- | distrib/sgi/cdfs/Makefile | 6 | ||||
| -rw-r--r-- | distrib/sgi/iso/Makefile | 4 | ||||
| -rw-r--r-- | distrib/sgi/ramdisk/Makefile | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/distrib/sgi/cdfs/Makefile b/distrib/sgi/cdfs/Makefile index f27c58534d5..897f55c0583 100644 --- a/distrib/sgi/cdfs/Makefile +++ b/distrib/sgi/cdfs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2019/05/02 01:18:40 deraadt Exp $ +# $OpenBSD: Makefile,v 1.26 2019/05/03 20:03:59 deraadt Exp $ FS= miniroot${OSrev}.fs CDROM= cd${OSrev}.iso @@ -21,11 +21,11 @@ ${CDROM}: dd if=/dev/zero of=${FS} bs=1m count=${CDFSMB} vnconfig -v ${FS} > vnd disklabel -w `cat vnd` minicdroot "OpenBSD/sgi " - newfs /dev/r`cat vnd`a + newfs -m 0 -o space -i 524288 -c ${FSSIZE} /dev/r`cat vnd`a mount /dev/`cat vnd`a ${.OBJDIR}/cd-dir mkdir -p ${.OBJDIR}/cd-dir/${OSrev}/sgi .for IP in ${ALLIP} - gzip -9f < ${.OBJDIR}/../ramdisk/bsd.rd.IP${IP} > \ + gzip -9cf ${.OBJDIR}/../ramdisk/bsd.rd.IP${IP} > \ ${.OBJDIR}/cd-dir/bsd.IP${IP} ln ${.OBJDIR}/cd-dir/bsd.IP${IP} ${.OBJDIR}/cd-dir/bsd.rd.IP${IP} ln ${.OBJDIR}/cd-dir/bsd.IP${IP} ${.OBJDIR}/cd-dir/${OSrev}/sgi/bsd.IP${IP} diff --git a/distrib/sgi/iso/Makefile b/distrib/sgi/iso/Makefile index 28d214b231a..8127627013a 100644 --- a/distrib/sgi/iso/Makefile +++ b/distrib/sgi/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.35 2019/04/30 21:14:59 deraadt Exp $ +# $OpenBSD: Makefile,v 1.36 2019/05/03 20:03:59 deraadt Exp $ CDROM= install${OSrev}.iso RELXDIR?= /home/relx-${MACHINE} @@ -69,7 +69,7 @@ ${CDROM}: vnconfig -v -t cdroot ${CDROM} > vnd disklabel -w `cat vnd` cdroot "OpenBSD/sgi " - newfs /dev/r`cat vnd`a + newfs -m 0 -o space -i 524288 -c ${FSSIZE} /dev/r`cat vnd`a mount /dev/`cat vnd`a ${.OBJDIR}/cd-dir mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE} diff --git a/distrib/sgi/ramdisk/Makefile b/distrib/sgi/ramdisk/Makefile index 6b593af4e8f..9340db0c536 100644 --- a/distrib/sgi/ramdisk/Makefile +++ b/distrib/sgi/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2019/04/30 21:14:59 deraadt Exp $ +# $OpenBSD: Makefile,v 1.31 2019/05/03 20:03:59 deraadt Exp $ MTREE= ${UTILS}/mtree.conf @@ -21,9 +21,9 @@ bsd.rd.IP${IP}: mr.fs bsd.IP${IP} rdsetroot bsd.rd.IP${IP} mr.fs bsd.IP${IP}: - cd ${.CURDIR}/../../../sys/arch/sgi/compile/RAMDISK-IP${IP} && \ + cd ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/RAMDISK-IP${IP} && \ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' - cp -p ${.CURDIR}/../../../sys/arch/sgi/compile/RAMDISK-IP${IP}/obj/bsd bsd.IP${IP} + cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/RAMDISK-IP${IP}/obj/bsd bsd.IP${IP} .endfor mr.fs: instbin |