summaryrefslogtreecommitdiff
path: root/distrib/hppa
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2019-05-03 20:04:00 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2019-05-03 20:04:00 +0000
commitf4d1d40f84c06cfca32e8a6713275b7561d2c0d4 (patch)
tree3554042028da01bab315c7e330c123ff1f6c1b44 /distrib/hppa
parent5dea246e02f9e7cb55b01c138de3fbe57bb27664 (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/hppa')
-rw-r--r--distrib/hppa/ramdisk/Makefile13
1 files changed, 7 insertions, 6 deletions
diff --git a/distrib/hppa/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile
index 5d1b1ba2fd8..51d47f14f8c 100644
--- a/distrib/hppa/ramdisk/Makefile
+++ b/distrib/hppa/ramdisk/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.43 2019/04/30 23:25:19 deraadt Exp $
+# $OpenBSD: Makefile,v 1.44 2019/05/03 20:03:58 deraadt Exp $
LIF= lif${OSrev}.fs
CDROM= cd${OSrev}.iso
MTREE= ${UTILS}/mtree.conf
+RAMDISK= RAMDISK
LISTS= ${.CURDIR}/../list ${.CURDIR}/list.local
UTILS= ${.CURDIR}/../../miniroot
@@ -28,18 +29,18 @@ ${CDROM}: bsd.rd
bs=32k count=1 conv=notrunc
dd if=/dev/zero bs=64k count=1 >> ${.OBJDIR}/${CDROM}
+bsd.lif: bsd.rd
+ (cat bsd.rd ; dd if=/dev/zero count=1) | gzip -9n > bsd.lif
+
bsd.rd: mr.fs bsd
cp bsd bsd.rd
rdsetroot bsd.rd mr.fs
strip -R .SUNW_ctf bsd.rd
-bsd.lif: bsd.rd
- (cat bsd.rd ; dd if=/dev/zero count=1) | gzip -9nv > bsd.lif
-
bsd:
- cd ${.CURDIR}/../../../sys/arch/hppa/compile/RAMDISK && \
+ cd ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK} && \
su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}'
- cp -p ${.CURDIR}/../../../sys/arch/hppa/compile/RAMDISK/obj/bsd bsd
+ cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd bsd
mr.fs: instbin
rm -rf $@.d