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/loongson | |
| 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/loongson')
| -rw-r--r-- | distrib/loongson/ramdisk/Makefile | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/distrib/loongson/ramdisk/Makefile b/distrib/loongson/ramdisk/Makefile index 3043e8f7be7..b9be639e5a2 100644 --- a/distrib/loongson/ramdisk/Makefile +++ b/distrib/loongson/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2019/05/01 22:55:58 deraadt Exp $ +# $OpenBSD: Makefile,v 1.24 2019/05/03 20:03:58 deraadt Exp $ FS= miniroot${OSrev}.fs FSSIZE= 18432 @@ -6,6 +6,7 @@ FSDISKTYPE= miniroot CDROM= cd${OSrev}.iso MOUNT_POINT= /mnt MTREE= ${UTILS}/mtree.conf +RAMDISK= RAMDISK LISTS= ${.CURDIR}/list UTILS= ${.CURDIR}/../../miniroot @@ -22,7 +23,8 @@ ${FS}: bsd.rd echo 'w\ny\nq\n' | disklabel -E `cat vnd` > /dev/null newfs_ext2fs /dev/r`cat vnd`i mount /dev/`cat vnd`i ${MOUNT_POINT} - cp ${.OBJDIR}/bsd.rd ${MOUNT_POINT}/bsd.rd + install -c -m 555 -o root -g wheel bsd.gz ${MOUNT_POINT}/bsd + ln ${MOUNT_POINT}/bsd ${MOUNT_POINT}/bsd.rd df -i ${MOUNT_POINT} -umount ${MOUNT_POINT} vnconfig -u `cat vnd` @@ -45,6 +47,11 @@ bsd.rd: mr.fs bsd cp bsd bsd.rd rdsetroot bsd.rd mr.fs +bsd: + cd ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK} && \ + su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' + cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd + mr.fs: instbin rm -rf $@.d install -d -o root -g wheel $@.d @@ -55,11 +62,6 @@ mr.fs: instbin rm $@.d/instbin makefs ${MRMAKEFSARGS} $@ $@.d -bsd: - cd ${.CURDIR}/../../../sys/arch/loongson/compile/RAMDISK && \ - su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' - cp -p ${.CURDIR}/../../../sys/arch/loongson/compile/RAMDISK/obj/bsd bsd - instbin.mk instbin.cache instbin.c: instbin.conf crunchgen -E -M -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib \ -c instbin.c -e instbin -m instbin.mk instbin.conf |