diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2021-01-05 15:10:44 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2021-01-05 15:10:44 +0000 |
| commit | 1af9970686f04bad58682eac55a1e831cefe8147 (patch) | |
| tree | 7550141fa0d416afd47d519d024a150b983aa2e3 /distrib/amd64 | |
| parent | 9315669cfa803bcc285de26b56c529e556caa98a (diff) | |
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.
Diffstat (limited to 'distrib/amd64')
| -rw-r--r-- | distrib/amd64/iso/Makefile | 12 | ||||
| -rw-r--r-- | distrib/amd64/ramdisk_cd/Makefile | 4 |
2 files changed, 5 insertions, 11 deletions
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} |