diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-05-03 20:04:00 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-05-03 20:04:00 +0000 |
| commit | f4d1d40f84c06cfca32e8a6713275b7561d2c0d4 (patch) | |
| tree | 3554042028da01bab315c7e330c123ff1f6c1b44 /distrib/amd64/ramdiskA | |
| parent | 5dea246e02f9e7cb55b01c138de3fbe57bb27664 (diff) | |
Further removal of differences (using install instead of cp, sorting
chunks in a specified order, using a few variables, performing bsd.rd
to bsd.gz conversion as similar as possible)
Diffstat (limited to 'distrib/amd64/ramdiskA')
| -rw-r--r-- | distrib/amd64/ramdiskA/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/distrib/amd64/ramdiskA/Makefile b/distrib/amd64/ramdiskA/Makefile index 60171d11600..fd0de7b0b2d 100644 --- a/distrib/amd64/ramdiskA/Makefile +++ b/distrib/amd64/ramdiskA/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.6 2019/04/30 23:25:19 deraadt Exp $ +# $OpenBSD: Makefile,v 1.7 2019/05/03 20:03:58 deraadt Exp $ FS= floppy${OSrev}.fs FSSIZE= 2880 FSDISKTYPE= floppy3 MOUNT_POINT= /mnt MTREE= ${UTILS}/mtree.conf +RAMDISK= RAMDISK LISTS= ${.CURDIR}/../common/list ${.CURDIR}/list.local UTILS= ${.CURDIR}/../../miniroot @@ -24,7 +25,7 @@ ${FS}: bsd.gz strip -R .comment -R .SUNW_ctf ${.OBJDIR}/boot installboot -v -r ${MOUNT_POINT} `cat vnd` \ ${DESTDIR}/usr/mdec/biosboot ${.OBJDIR}/boot - dd if=bsd.gz of=${MOUNT_POINT}/bsd bs=512 + install -c -m 555 -o root -g wheel bsd.gz ${MOUNT_POINT}/bsd df -i ${MOUNT_POINT} umount ${MOUNT_POINT} vnconfig -u `cat vnd` @@ -37,16 +38,16 @@ bsd.gz: bsd.rd cp bsd.rd bsd.strip strip bsd.strip strip -R .comment -R .SUNW_ctf bsd.strip - gzip -c9n bsd.strip > bsd.gz + gzip -9cn bsd.strip > bsd.gz bsd.rd: mr.fs bsd cp bsd bsd.rd rdsetroot bsd.rd mr.fs bsd: - cd ${.CURDIR}/../../../sys/arch/amd64/compile/RAMDISK && \ + cd ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK} && \ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' - cp -p ${.CURDIR}/../../../sys/arch/amd64/compile/RAMDISK/obj/bsd bsd + cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd mr.fs: instbin rm -rf $@.d |