diff options
| author | Sebastien Marie <semarie@cvs.openbsd.org> | 2021-02-14 17:11:03 +0000 |
|---|---|---|
| committer | Sebastien Marie <semarie@cvs.openbsd.org> | 2021-02-14 17:11:03 +0000 |
| commit | 71b18407c1401e9300aedb1afe1d6f47e76518cf (patch) | |
| tree | 49329091fd1c93fa5f72fbb2b5d4afd17a2b3500 /distrib/sgi | |
| parent | 5fdb5ff0454e5fca152d7967e6fd039a79a5850d (diff) | |
distrib: use ${MACHINE} instead of hardcoded value
ok deraadt@
Diffstat (limited to 'distrib/sgi')
| -rw-r--r-- | distrib/sgi/cdfs/Makefile | 10 | ||||
| -rw-r--r-- | distrib/sgi/iso/Makefile | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/distrib/sgi/cdfs/Makefile b/distrib/sgi/cdfs/Makefile index 9d9c2ecd83e..61cf26eadb4 100644 --- a/distrib/sgi/cdfs/Makefile +++ b/distrib/sgi/cdfs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2020/05/18 06:20:43 otto Exp $ +# $OpenBSD: Makefile,v 1.31 2021/02/14 17:11:02 semarie Exp $ FS= miniroot${OSrev}.img CDROM= cd${OSrev}.iso @@ -19,16 +19,16 @@ SGIVOLSZ= 33500 ${CDROM}: dd if=/dev/zero of=${FS} bs=1m count=${CDFSMB} vnconfig -v ${FS} > vnd - disklabel -w `cat vnd` minicdroot "OpenBSD/sgi " + disklabel -w `cat vnd` minicdroot "OpenBSD/${MACHINE}" newfs -O 1 -m 0 -o space -i 524288 /dev/r`cat vnd`a mount /dev/`cat vnd`a ${MOUNT_POINT} - mkdir -p ${MOUNT_POINT}/${OSrev}/sgi + mkdir -p ${MOUNT_POINT}/${OSrev}/${MACHINE} .for IP in ${ALLIP} gzip -9cf ${.OBJDIR}/../ramdisk/bsd.rd.IP${IP} > \ ${MOUNT_POINT}/bsd.IP${IP} ln ${MOUNT_POINT}/bsd.IP${IP} ${MOUNT_POINT}/bsd.rd.IP${IP} - ln ${MOUNT_POINT}/bsd.IP${IP} ${MOUNT_POINT}/${OSrev}/sgi/bsd.IP${IP} - ln ${MOUNT_POINT}/bsd.IP${IP} ${MOUNT_POINT}/${OSrev}/sgi/bsd.rd.IP${IP} + ln ${MOUNT_POINT}/bsd.IP${IP} ${MOUNT_POINT}/${OSrev}/${MACHINE}/bsd.IP${IP} + ln ${MOUNT_POINT}/bsd.IP${IP} ${MOUNT_POINT}/${OSrev}/${MACHINE}/bsd.rd.IP${IP} .endfor cp ${DESTDIR}/usr/mdec/bootecoff ${MOUNT_POINT}/bootecoff cp ${DESTDIR}/usr/mdec/boot32 ${MOUNT_POINT}/boot32 diff --git a/distrib/sgi/iso/Makefile b/distrib/sgi/iso/Makefile index e3d93be8646..27ce016e067 100644 --- a/distrib/sgi/iso/Makefile +++ b/distrib/sgi/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.38 2020/05/18 06:20:43 otto Exp $ +# $OpenBSD: Makefile,v 1.39 2021/02/14 17:11:02 semarie Exp $ CDROM= install${OSrev}.iso RELXDIR?= /home/relx-${MACHINE} @@ -68,7 +68,7 @@ ${CDROM}: vnconfig -v -t cdroot ${CDROM} > vnd - disklabel -w `cat vnd` cdroot "OpenBSD/sgi " + disklabel -w `cat vnd` cdroot "OpenBSD/${MACHINE}" newfs -O 1 -m 0 -o space -i 524288 /dev/r`cat vnd`a mount /dev/`cat vnd`a ${.OBJDIR}/cd-dir mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE} |