distribute the gzip'd version of bsd.rd on platforms where we all boot

methods support it.  if anyone finds a method which does not work, please
speak up.

7 files changed, 16 insertions, 28 deletions

diff --git a/distrib/alpha/miniroot/Makefile b/distrib/alpha/miniroot/Makefile
index 176001563e3..67851a7456d 100644
--- a/distrib/alpha/miniroot/Makefile
+++ b/distrib/alpha/miniroot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.17 2020/05/18 06:20:43 otto Exp $
+#	$OpenBSD: Makefile,v 1.18 2021/01/05 15:10:40 deraadt Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		5760
@@ -104,7 +104,7 @@ unconfig:
 
 .ifdef RELEASEDIR
 install:
-	cp bsd.rd ${RELEASEDIR}/bsd.rd
+	cp bsd.gz ${RELEASEDIR}/bsd.rd
 	chmod a+r ${RELEASEDIR}/bsd.rd
 	cp ${FS} ${RELEASEDIR}
 	cp ${CDROM} ${RELEASEDIR}
diff --git a/distrib/amd64/iso/Makefile b/distrib/amd64/iso/Makefile
index 1c31bcdee16..d70f3985817 100644
--- a/distrib/amd64/iso/Makefile
+++ b/distrib/amd64/iso/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.39 2020/08/05 04:23:30 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.40 2021/01/05 15:10:42 deraadt Exp $
 
 FS=		install${OSrev}.img
 FSSIZE=		1359872
@@ -25,7 +25,7 @@ TEMPLATE=	${.CURDIR}/template
 
 all: ${FS} ${CDROM}
 
-${FS}: ${BASE} ${XBASE} bsd.gz
+${FS}: ${BASE} ${XBASE} bsd.rd
 	dd if=/dev/zero of=${FS} bs=512 count=${TOTALSIZE}
 	vnconfig -v ${FS} > vnd
 	fdisk -yi -l ${FSSIZE} -b ${MSDOSSIZE} -f ${DESTDIR}/usr/mdec/mbr `cat vnd`
@@ -49,7 +49,7 @@ ${FS}: ${BASE} ${XBASE} bsd.gz
 	mkdir -p ${MOUNT_POINT}/${OSREV}/${MACHINE}
 	mkdir -p ${MOUNT_POINT}/etc
 	echo "set image /${OSREV}/${MACHINE}/bsd.rd" > ${MOUNT_POINT}/etc/boot.conf
-	install -c -m 555 -o root -g wheel bsd.gz ${MOUNT_POINT}/bsd
+	install -c -m 555 -o root -g wheel bsd.rd ${MOUNT_POINT}/bsd
 	ln ${MOUNT_POINT}/bsd ${MOUNT_POINT}/bsd.rd
 
 	cp -p ${BASE} ${MOUNT_POINT}/${OSREV}/${MACHINE}
@@ -94,12 +94,6 @@ clean cleandir:
 	rm -f ${CDROM} ${FS}
 	rm -rf cd-dir
 
-bsd.gz: bsd.rd
-	cp bsd.rd bsd.strip
-	strip bsd.strip
-	strip -R .comment -R .SUNW_ctf bsd.strip
-	gzip -9cn bsd.strip > bsd.gz
-
 bsd.rd: ${BSDRD}
 	cp ${BSDRD} bsd.rd
 
diff --git a/distrib/amd64/ramdisk_cd/Makefile b/distrib/amd64/ramdisk_cd/Makefile
index 8b4351f23aa..1b0cb7903dc 100644
--- a/distrib/amd64/ramdisk_cd/Makefile
+++ b/distrib/amd64/ramdisk_cd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.23 2020/09/15 11:44:51 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.24 2021/01/05 15:10:42 deraadt Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		9920
@@ -99,7 +99,7 @@ unconfig:
 
 .ifdef RELEASEDIR
 install:
-	cp bsd.rd ${RELEASEDIR}/bsd.rd
+	cp bsd.gz ${RELEASEDIR}/bsd.rd
 	chmod a+r ${RELEASEDIR}/bsd.rd
 	cp ${FS} ${RELEASEDIR}
 	cp ${CDROM} ${RELEASEDIR}
diff --git a/distrib/i386/iso/Makefile b/distrib/i386/iso/Makefile
index 5156f837cf8..1b142328723 100644
--- a/distrib/i386/iso/Makefile
+++ b/distrib/i386/iso/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.29 2020/08/05 04:23:30 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.30 2021/01/05 15:10:42 deraadt Exp $
 
 FS=		install${OSrev}.img
 FSSIZE=		921600
@@ -20,7 +20,7 @@ XBASE=		${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xfont${OSrev}.tgz \
 
 all: ${FS} ${CDROM}
 
-${FS}: ${BASE} ${XBASE} bsd.gz
+${FS}: ${BASE} ${XBASE} bsd.rd
 	dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE}
 	vnconfig -v ${FS} > vnd
 	fdisk -yi -l ${FSSIZE} -f ${DESTDIR}/usr/mdec/mbr `cat vnd`
@@ -31,7 +31,7 @@ ${FS}: ${BASE} ${XBASE} bsd.gz
 	strip -R .comment -R .SUNW_ctf ${MOUNT_POINT}/boot
 	installboot -v -r ${MOUNT_POINT} `cat vnd` \
 	    ${DESTDIR}/usr/mdec/biosboot ${MOUNT_POINT}/boot
-	install -c -m 555 -o root -g wheel bsd.gz ${MOUNT_POINT}/bsd
+	install -c -m 555 -o root -g wheel bsd.rd ${MOUNT_POINT}/bsd
 	ln ${MOUNT_POINT}/bsd ${MOUNT_POINT}/bsd.rd
 	mkdir -p ${MOUNT_POINT}/${OSREV}/${MACHINE}
 	mkdir -p ${MOUNT_POINT}/etc
@@ -73,12 +73,6 @@ ${CDROM}: ${BASE} ${XBASE}
 	    -b ${OSREV}/${MACHINE}/cdbr -c ${OSREV}/${MACHINE}/boot.catalog \
 	    ${.OBJDIR}/cd-dir
 
-bsd.gz: bsd.rd
-	cp bsd.rd bsd.strip
-	strip bsd.strip
-	strip -R .comment -R .SUNW_ctf bsd.strip
-	gzip -9cn bsd.strip > bsd.gz
-
 bsd.rd: ${BSDRD}
 	cp ${BSDRD} bsd.rd
 
diff --git a/distrib/i386/ramdisk_cd/Makefile b/distrib/i386/ramdisk_cd/Makefile
index 2f4a3daebe2..77fdc3e10fc 100644
--- a/distrib/i386/ramdisk_cd/Makefile
+++ b/distrib/i386/ramdisk_cd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.17 2020/05/18 06:20:43 otto Exp $
+#	$OpenBSD: Makefile,v 1.18 2021/01/05 15:10:43 deraadt Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		8064
@@ -96,7 +96,7 @@ unconfig:
 
 .ifdef RELEASEDIR
 install:
-	cp bsd.rd ${RELEASEDIR}/bsd.rd
+	cp bsd.gz ${RELEASEDIR}/bsd.rd
 	chmod a+r ${RELEASEDIR}/bsd.rd
 	cp ${FS} ${RELEASEDIR}
 	cp ${CDROM} ${RELEASEDIR}
diff --git a/distrib/landisk/ramdisk/Makefile b/distrib/landisk/ramdisk/Makefile
index 526a9dbc833..a2edf62159f 100644
--- a/distrib/landisk/ramdisk/Makefile
+++ b/distrib/landisk/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.32 2020/05/18 06:20:43 otto Exp $
+#	$OpenBSD: Makefile,v 1.33 2021/01/05 15:10:43 deraadt Exp $
 
 FS=		miniroot${OSrev}.img
 FSSIZE=		5120
@@ -70,7 +70,7 @@ unconfig:
 
 .ifdef RELEASEDIR
 install:
-	cp bsd.rd ${RELEASEDIR}/bsd.rd
+	cp bsd.gz ${RELEASEDIR}/bsd.rd
 	chmod a+r ${RELEASEDIR}/bsd.rd
 	cp ${FS} ${RELEASEDIR}
 .endif
diff --git a/distrib/macppc/ramdisk/Makefile b/distrib/macppc/ramdisk/Makefile
index 6f09b84f1d8..e669a13782a 100644
--- a/distrib/macppc/ramdisk/Makefile
+++ b/distrib/macppc/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.47 2020/04/02 19:30:00 gkoehler Exp $
+#	$OpenBSD: Makefile,v 1.48 2021/01/05 15:10:43 deraadt Exp $
 
 CDROM=		cd${OSrev}.iso
 MTREE=		${UTILS}/mtree.conf
@@ -66,7 +66,7 @@ instbin.conf: ${LISTS}
 
 .ifdef RELEASEDIR
 install:
-	cp bsd.rd ${RELEASEDIR}/bsd.rd
+	cp bsd.gz ${RELEASEDIR}/bsd.rd
 	chmod a+r ${RELEASEDIR}/bsd.rd
 	cp ${CDROM} ${RELEASEDIR}
 .endif