From baed9b61ded69bbf85e44b2c895065489ffca1cd Mon Sep 17 00:00:00 2001
From: semarie <semarie@openbsd.org>
Date: Sun, 14 Feb 2021 17:11:02 +0000
Subject: [PATCH] distrib: use ${MACHINE} instead of hardcoded value

ok deraadt@
---
 distrib/amd64/ramdisk_cd/Makefile | 18 +++++++++---------
 distrib/hppa/ramdisk/Makefile     |  6 +++---
 distrib/i386/ramdisk_cd/Makefile  | 18 +++++++++---------
 distrib/loongson/ramdisk/Makefile | 12 ++++++------
 distrib/macppc/ramdisk/Makefile   | 16 ++++++++--------
 distrib/sgi/cdfs/Makefile         | 10 +++++-----
 distrib/sgi/iso/Makefile          |  4 ++--
 distrib/sparc64/miniroot/Makefile | 16 ++++++++--------
 8 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/distrib/amd64/ramdisk_cd/Makefile b/distrib/amd64/ramdisk_cd/Makefile
index ba206c042f3..591a12b09b7 100644
--- a/distrib/amd64/ramdisk_cd/Makefile
+++ b/distrib/amd64/ramdisk_cd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.28 2021/02/13 18:52:08 semarie Exp $
+#	$OpenBSD: Makefile,v 1.29 2021/02/14 17:11:02 semarie Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		9920
@@ -38,18 +38,18 @@ ${FS}: bsd.gz
 
 ${CDROM}: bsd.rd
 	rm -rf ${.OBJDIR}/cd-dir
-	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/amd64
+	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 	mkdir -p ${.OBJDIR}/cd-dir/etc
-	echo "set image /${OSREV}/amd64/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf
-	cp ${.OBJDIR}/bsd.rd ${.OBJDIR}/cd-dir/${OSREV}/amd64
-	cp ${DESTDIR}/usr/mdec/cdbr ${.OBJDIR}/cd-dir/${OSREV}/amd64
-	cp ${DESTDIR}/usr/mdec/cdboot ${.OBJDIR}/cd-dir/${OSREV}/amd64/cdboot
+	echo "set image /${OSREV}/${MACHINE}/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf
+	cp ${.OBJDIR}/bsd.rd ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
+	cp ${DESTDIR}/usr/mdec/cdbr ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
+	cp ${DESTDIR}/usr/mdec/cdboot ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/cdboot
 	mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} \
-	    -A "OpenBSD ${OSREV} amd64 bootonly CD" \
+	    -A "OpenBSD ${OSREV} ${MACHINE} bootonly CD" \
 	    -P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
 	    -p "Theo de Raadt <deraadt@openbsd.org>" \
-	    -V "OpenBSD/amd64   ${OSREV} boot-only CD" \
-	    -b ${OSREV}/amd64/cdbr -c ${OSREV}/amd64/boot.catalog \
+	    -V "OpenBSD/${MACHINE}   ${OSREV} boot-only CD" \
+	    -b ${OSREV}/${MACHINE}/cdbr -c ${OSREV}/${MACHINE}/boot.catalog \
 	    ${.OBJDIR}/cd-dir
 
 MRDISKTYPE=	rdrootb
diff --git a/distrib/hppa/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile
index 8f8e3ae334f..d7997d6dc60 100644
--- a/distrib/hppa/ramdisk/Makefile
+++ b/distrib/hppa/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.46 2020/05/17 17:04:27 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.47 2021/02/14 17:11:02 semarie Exp $
 
 LIF=		lif${OSrev}.img
 CDROM=		cd${OSrev}.iso
@@ -20,10 +20,10 @@ ${CDROM}: bsd.rd
 	rm -rf ${.OBJDIR}/cd-dir/
 	mkdir -p ${.OBJDIR}/cd-dir/
 	cp bsd.rd ${.OBJDIR}/cd-dir/bsd.rd
-	mkhybrid -A "OpenBSD ${OSREV} hppa bootonly CD" \
+	mkhybrid -A "OpenBSD ${OSREV} ${MACHINE} bootonly CD" \
 	    -P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
 	    -p "Theo de Raadt <deraadt@openbsd.org>" \
-	    -V "OpenBSD/hppa ${OSREV} boot-only CD" \
+	    -V "OpenBSD/${MACHINE} ${OSREV} boot-only CD" \
 	    -o ${.OBJDIR}/${CDROM} ${.OBJDIR}/cd-dir
 	dd if=${DESTDIR}/usr/mdec/cdboot of=${.OBJDIR}/${CDROM} \
 	    bs=32k count=1 conv=notrunc
diff --git a/distrib/i386/ramdisk_cd/Makefile b/distrib/i386/ramdisk_cd/Makefile
index 81178b58cdd..900def94cad 100644
--- a/distrib/i386/ramdisk_cd/Makefile
+++ b/distrib/i386/ramdisk_cd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.22 2021/02/13 18:52:08 semarie Exp $
+#	$OpenBSD: Makefile,v 1.23 2021/02/14 17:11:02 semarie Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		8064
@@ -35,18 +35,18 @@ ${FS}: bsd.gz
 
 ${CDROM}: bsd.rd
 	rm -rf ${.OBJDIR}/cd-dir
-	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/i386
+	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 	mkdir -p ${.OBJDIR}/cd-dir/etc
-	echo "set image /${OSREV}/i386/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf
-	cp ${.OBJDIR}/bsd.rd ${.OBJDIR}/cd-dir/${OSREV}/i386
-	cp ${DESTDIR}/usr/mdec/cdbr ${.OBJDIR}/cd-dir/${OSREV}/i386
-	cp ${DESTDIR}/usr/mdec/cdboot ${.OBJDIR}/cd-dir/${OSREV}/i386/cdboot
+	echo "set image /${OSREV}/${MACHINE}/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf
+	cp ${.OBJDIR}/bsd.rd ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
+	cp ${DESTDIR}/usr/mdec/cdbr ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
+	cp ${DESTDIR}/usr/mdec/cdboot ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/cdboot
 	mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} \
-	    -A "OpenBSD ${OSREV} i386 bootonly CD" \
+	    -A "OpenBSD ${OSREV} ${MACHINE} bootonly CD" \
 	    -P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
 	    -p "Theo de Raadt <deraadt@openbsd.org>" \
-	    -V "OpenBSD/i386    ${OSREV} boot-only CD" \
-	    -b ${OSREV}/i386/cdbr -c ${OSREV}/i386/boot.catalog \
+	    -V "OpenBSD/${MACHINE}    ${OSREV} boot-only CD" \
+	    -b ${OSREV}/${MACHINE}/cdbr -c ${OSREV}/${MACHINE}/boot.catalog \
 	    ${.OBJDIR}/cd-dir
 
 MRDISKTYPE=	rdrootb
diff --git a/distrib/loongson/ramdisk/Makefile b/distrib/loongson/ramdisk/Makefile
index 710bc733c19..cbccb014853 100644
--- a/distrib/loongson/ramdisk/Makefile
+++ b/distrib/loongson/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.29 2021/02/13 18:46:52 semarie Exp $
+#	$OpenBSD: Makefile,v 1.30 2021/02/14 17:11:02 semarie Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		18432
@@ -33,15 +33,15 @@ ${FS}: bsd.strip
 
 ${CDROM}: bsd.rd
 	rm -rf ${.OBJDIR}/cd-dir
-	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/loongson
+	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 	mkdir -p ${.OBJDIR}/cd-dir/etc
-	echo "set image /${OSREV}/loongson/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf
-	cp ${.OBJDIR}/bsd.rd ${.OBJDIR}/cd-dir/${OSREV}/loongson
+	echo "set image /${OSREV}/${MACHINE}/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf
+	cp ${.OBJDIR}/bsd.rd ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 	mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} \
-	    -A "OpenBSD ${OSREV} loongson bootonly CD" \
+	    -A "OpenBSD ${OSREV} ${MACHINE} bootonly CD" \
 	    -P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
 	    -p "Theo de Raadt <deraadt@openbsd.org>" \
-	    -V "OpenBSD/loongson ${OSREV} boot CD" \
+	    -V "OpenBSD/${MACHINE} ${OSREV} boot CD" \
 	    ${.OBJDIR}/cd-dir
 
 bsd.strip: bsd.rd
diff --git a/distrib/macppc/ramdisk/Makefile b/distrib/macppc/ramdisk/Makefile
index e669a13782a..820633da3b0 100644
--- a/distrib/macppc/ramdisk/Makefile
+++ b/distrib/macppc/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.48 2021/01/05 15:10:43 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.49 2021/02/14 17:11:02 semarie Exp $
 
 CDROM=		cd${OSrev}.iso
 MTREE=		${UTILS}/mtree.conf
@@ -11,21 +11,21 @@ all: ${CDROM}
 
 ${CDROM}: bsd.gz
 	rm -rf ${.OBJDIR}/cd-dir/
-	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/macppc/
-	cp bsd.gz ${.OBJDIR}/cd-dir/${OSREV}/macppc/bsd.rd
+	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/
+	cp bsd.gz ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/bsd.rd
 	# On HFS, doing the following means COPIES of the files.. therefore
 	# we skip doing so.
-	# ln ${.OBJDIR}/cd-dir/${OSREV}/macppc/bsd.rd ${.OBJDIR}/cd-dir/bsd.rd
+	# ln ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/bsd.rd ${.OBJDIR}/cd-dir/bsd.rd
 	# ln ${.OBJDIR}/cd-dir/bsd.rd ${.OBJDIR}/cd-dir/bsd
-	cp ${DESTDIR}/usr/mdec/bsd.tbxi ${.OBJDIR}/cd-dir/${OSREV}/macppc
+	cp ${DESTDIR}/usr/mdec/bsd.tbxi ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 	cp ${DESTDIR}/usr/mdec/ofwboot ${.OBJDIR}/cd-dir/
 	mkhybrid -r -part -hfs \
-	    -hfs-bless ${.OBJDIR}/cd-dir/${OSREV}/macppc \
+	    -hfs-bless ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE} \
 	    -map ${.CURDIR}/../../../gnu/usr.sbin/mkhybrid/src/more.mapping \
-	    -A "OpenBSD ${OSREV} macppc bootonly CD" \
+	    -A "OpenBSD ${OSREV} ${MACHINE} bootonly CD" \
 	    -P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
 	    -p "Theo de Raadt <deraadt@openbsd.org>" \
-	    -V "OpenBSD/macppc  ${OSREV} boot-only CD" \
+	    -V "OpenBSD/${MACHINE}  ${OSREV} boot-only CD" \
 	    -o ${CDROM} ${.OBJDIR}/cd-dir
 
 MRDISKTYPE=	rdroot
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}
diff --git a/distrib/sparc64/miniroot/Makefile b/distrib/sparc64/miniroot/Makefile
index 4aa85fa391a..f38c2a1377c 100644
--- a/distrib/sparc64/miniroot/Makefile
+++ b/distrib/sparc64/miniroot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.25 2021/02/13 18:41:52 semarie Exp $
+#	$OpenBSD: Makefile,v 1.26 2021/02/14 17:11:02 semarie Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		6400
@@ -34,10 +34,10 @@ ${FS}: bsd.gz
 
 ${CDROM}: bsd.rd ${FS}
 	rm -rf ${.OBJDIR}/cd-dir
-	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/sparc64
-	cp ${.OBJDIR}/bsd.rd ${.OBJDIR}/cd-dir/${OSREV}/sparc64
-	ln ${.OBJDIR}/cd-dir/${OSREV}/sparc64/bsd.rd ${.OBJDIR}/cd-dir/${OSREV}/sparc64/bsd
-	cp ${DESTDIR}/usr/mdec/ofwboot ${.OBJDIR}/cd-dir/${OSREV}/sparc64
+	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
+	cp ${.OBJDIR}/bsd.rd ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
+	ln ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/bsd.rd ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/bsd
+	cp ${DESTDIR}/usr/mdec/ofwboot ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
 
 	echo 'm 1	sun4' > ${.OBJDIR}/cd-dir/.slicemapfile
 	echo 'm 2	sun4c' >> ${.OBJDIR}/cd-dir/.slicemapfile
@@ -47,13 +47,13 @@ ${CDROM}: bsd.rd ${FS}
 	echo 'm 5	sun4us' >> ${.OBJDIR}/cd-dir/.slicemapfile
 	echo 'm 6	sun4v' >> ${.OBJDIR}/cd-dir/.slicemapfile
 	mkhybrid -a -R -r -T -L -d -D -N \
-	    -A "OpenBSD ${OSREV} sparc64 bootonly CD" \
+	    -A "OpenBSD ${OSREV} ${MACHINE} bootonly CD" \
 	    -P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
 	    -p "Theo de Raadt <deraadt@openbsd.org>" \
-	    -V "OpenBSD/sparc64 ${OSREV} boot-only CD" \
+	    -V "OpenBSD/${MACHINE} ${OSREV} boot-only CD" \
 	    -o ${.OBJDIR}/${CDROM} ${.OBJDIR}/cd-dir
 	vnconfig -v ${CDROM} > vnd
-	disklabel -w `cat vnd` fakecdrom "OpenBSD${OSrev}sparc64"
+	disklabel -w `cat vnd` fakecdrom "OpenBSD${OSrev}${MACHINE}"
 	vnconfig -u `cat vnd`
 	rm -f vnd
 	mksuncd f ${CDROM} ${FS}
-- 
2.20.1