diff options
Diffstat (limited to 'distrib/i386')
| -rw-r--r-- | distrib/i386/iso/Makefile | 12 | ||||
| -rw-r--r-- | distrib/i386/ramdisk_cd/Makefile | 4 |
2 files changed, 5 insertions, 11 deletions
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} |