Cull BSDRD variables which are always bsd.rd

7 files changed, 17 insertions, 23 deletions

diff --git a/distrib/amd64/cdfs/Makefile b/distrib/amd64/cdfs/Makefile
index 837336f7148..2863ffa5359 100644
--- a/distrib/amd64/cdfs/Makefile
+++ b/distrib/amd64/cdfs/Makefile
@@ -1,10 +1,9 @@
-#	$OpenBSD: Makefile,v 1.8 2014/03/06 02:35:12 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.9 2019/04/28 15:32:03 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
-BSDRD=	bsd.rd
 CDROM=	cd${REV}.iso
 
 all: ${CDROM}
@@ -14,7 +13,7 @@ ${CDROM}:
 	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/amd64
 	mkdir -p ${.OBJDIR}/cd-dir/etc
 	echo "set image /${OSREV}/amd64/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf
-	cp ${.OBJDIR}/../ramdisk_cd/${BSDRD} ${.OBJDIR}/cd-dir/${OSREV}/amd64
+	cp ${.OBJDIR}/../ramdisk_cd/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
 	mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} -v -v \
diff --git a/distrib/amd64/iso/Makefile b/distrib/amd64/iso/Makefile
index fb97a523fb7..d7f5ea0263c 100644
--- a/distrib/amd64/iso/Makefile
+++ b/distrib/amd64/iso/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.23 2019/04/28 14:48:09 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.24 2019/04/28 15:32:03 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -104,7 +104,7 @@ clean cleandir:
 	rm -rf cd-dir
 
 bsd.gz: bsd.rd
-	cp ${BSDRD} bsd.strip
+	cp bsd.rd bsd.strip
 	strip bsd.strip
 	strip -R .comment -R .SUNW_ctf bsd.strip
 	gzip -c9n bsd.strip > bsd.gz
diff --git a/distrib/arm64/ramdisk/Makefile b/distrib/arm64/ramdisk/Makefile
index 49ab3f920e0..4ab90a5835a 100644
--- a/distrib/arm64/ramdisk/Makefile
+++ b/distrib/arm64/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2019/04/28 15:21:49 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.8 2019/04/28 15:32:03 deraadt Exp $
 
 REV=	${OSrev}
 
@@ -25,9 +25,7 @@ all ${IMAGE}:
 	@false
 .else
 
-ALLBSD=		bsd
-ALLBSDRD=	bsd.rd
-all:	${ALLBSDRD}
+all:	bsd.rd
 
 bsd:
 	cd ${TOP}/../../sys/arch/arm64/compile/RAMDISK && \
@@ -64,14 +62,14 @@ ${CRUNCHCONF}: ${LISTS}
 
 clean cleandir:
 	/bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \
-	    lib*.a lib*.olist instbin.map *.o *.lo *.c ${ALLBSD} ${ALLBSDRD}
+	    lib*.a lib*.olist instbin.map *.o *.lo *.c bsd.rd
 	rm -f instbin.conf
 	rm -rf cd-dir ${IMAGE}.d
 
 .ifdef RELEASEDIR
 install:
-	cp ${ALLBSDRD} ${RELEASEDIR}
-	cd ${RELEASEDIR} && chmod a+r ${ALLBSDRD}
+	cp bsd.rd ${RELEASEDIR}
+	cd ${RELEASEDIR} && chmod a+r bsd.rd
 .endif	# RELEASEDIR
 
 .include <bsd.obj.mk>
diff --git a/distrib/i386/cdfs/Makefile b/distrib/i386/cdfs/Makefile
index cd390804ab5..01ce8776783 100644
--- a/distrib/i386/cdfs/Makefile
+++ b/distrib/i386/cdfs/Makefile
@@ -1,10 +1,9 @@
-#	$OpenBSD: Makefile,v 1.9 2009/04/17 15:59:48 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.10 2019/04/28 15:32:03 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
-BSDRD=	bsd.rd
 CDROM=	cd${REV}.iso
 
 all: ${CDROM}
@@ -14,7 +13,7 @@ ${CDROM}:
 	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/i386
 	mkdir -p ${.OBJDIR}/cd-dir/etc
 	echo "set image /${OSREV}/i386/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf
-	cp ${.OBJDIR}/../ramdisk_cd/${BSDRD} ${.OBJDIR}/cd-dir/${OSREV}/i386
+	cp ${.OBJDIR}/../ramdisk_cd/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
 	mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} -v -v \
diff --git a/distrib/i386/iso/Makefile b/distrib/i386/iso/Makefile
index 13227fda7af..4404c69b4df 100644
--- a/distrib/i386/iso/Makefile
+++ b/distrib/i386/iso/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.16 2019/04/28 14:48:10 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.17 2019/04/28 15:32:03 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
@@ -90,7 +90,7 @@ clean cleandir:
 	rm -rf cd-dir
 
 bsd.gz: bsd.rd
-	cp ${BSDRD} bsd.strip
+	cp bsd.rd bsd.strip
 	strip bsd.strip
 	strip -R .comment -R .SUNW_ctf bsd.strip
 	gzip -c9n bsd.strip > bsd.gz
diff --git a/distrib/loongson/cdfs/Makefile b/distrib/loongson/cdfs/Makefile
index 2cb008688e7..fc1d376716c 100644
--- a/distrib/loongson/cdfs/Makefile
+++ b/distrib/loongson/cdfs/Makefile
@@ -1,10 +1,9 @@
-#	$OpenBSD: Makefile,v 1.1 2010/02/07 08:38:40 otto Exp $
+#	$OpenBSD: Makefile,v 1.2 2019/04/28 15:32:03 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
-BSDRD=	bsd.rd
 CDROM=	cd${REV}.iso
 
 all: ${CDROM}
@@ -14,7 +13,7 @@ ${CDROM}:
 	mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/loongson
 	mkdir -p ${.OBJDIR}/cd-dir/etc
 	echo "set image /${OSREV}/loongson/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf
-	cp ${.OBJDIR}/../ramdisk/${BSDRD} ${.OBJDIR}/cd-dir/${OSREV}/loongson
+	cp ${.OBJDIR}/../ramdisk/bsd.rd ${.OBJDIR}/cd-dir/${OSREV}/loongson
 	mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} -v -v \
 	    -A "OpenBSD ${OSREV} loongson bootonly CD" \
 	    -P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
diff --git a/distrib/sgi/cdfs/Makefile b/distrib/sgi/cdfs/Makefile
index 00fde43d08a..9ed404819d8 100644
--- a/distrib/sgi/cdfs/Makefile
+++ b/distrib/sgi/cdfs/Makefile
@@ -1,10 +1,9 @@
-#	$OpenBSD: Makefile,v 1.17 2019/04/28 14:48:11 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.18 2019/04/28 15:32:03 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
-BSDRD=	bsd.rd
 CDROM=	cd${REV}.iso
 FFS=	ffs.img
 # must match the size of `minicdroot' in disktab
@@ -29,7 +28,7 @@ ${CDROM}:
 	mount /dev/`cat vnd`a ${.OBJDIR}/cd-dir
 	mkdir -p ${.OBJDIR}/cd-dir/${OSrev}/sgi
 .for IP in ${ALLIP}
-	gzip -9f < ${.OBJDIR}/../ramdisk/${BSDRD}.IP${IP} > \
+	gzip -9f < ${.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}