diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-04-28 14:48:12 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-04-28 14:48:12 +0000 |
| commit | 1c24a7b4a2202b4c466248a03b661fcf6c40e35e (patch) | |
| tree | 2214f1f048822bc64f69b522c02a32f6e17d0c80 /distrib/hppa | |
| parent | baeb4d23783efa1dd62e7c43c3296b8e6fad6a0d (diff) | |
Use new vnconfig vnd-auto-allocate mode. Resolve some variation between
architectures, and start removing some crazy junk that has collected
over the years. Being tested on all architectures...
ok various people.
Diffstat (limited to 'distrib/hppa')
| -rw-r--r-- | distrib/hppa/iso/Makefile | 5 | ||||
| -rw-r--r-- | distrib/hppa/ramdisk/Makefile | 15 |
2 files changed, 9 insertions, 11 deletions
diff --git a/distrib/hppa/iso/Makefile b/distrib/hppa/iso/Makefile index 7947309282f..5ffa812558b 100644 --- a/distrib/hppa/iso/Makefile +++ b/distrib/hppa/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2014/09/21 13:44:44 deraadt Exp $ +# $OpenBSD: Makefile,v 1.15 2019/04/28 14:48:10 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -47,8 +47,5 @@ install: clean cleandir: /bin/rm -rf cd-dir ${CDROM} -unconfig: - -vnconfig -u vnd0 - .include <bsd.obj.mk> .include <bsd.subdir.mk> diff --git a/distrib/hppa/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile index e775f740c5e..3a338a53b0f 100644 --- a/distrib/hppa/ramdisk/Makefile +++ b/distrib/hppa/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.36 2019/04/05 21:08:00 deraadt Exp $ +# $OpenBSD: Makefile,v 1.37 2019/04/28 14:48:10 deraadt Exp $ CBIN= instbin ARCHDIR= ${.CURDIR}/.. @@ -12,7 +12,7 @@ SRCDIR= ${.CURDIR}/../../.. IMAGE?= ramdisk${REV}.fs CRUNCHGENOPTS?=-E -KERNEL?= RAMDISK +RAMDISK?= RAMDISK UTILS?= ${.CURDIR}/../../miniroot LISTS= ${ARCHDIR}/list ${.CURDIR}/list.local @@ -48,9 +48,9 @@ ${CDROM}: bsd ${CDBOOT} dd if=/dev/zero bs=64k count=1 >> ${.OBJDIR}/${CDROM} obsd: - cd ${SRCDIR}/sys/arch/${MACHINE}/compile/${KERNEL} && \ + cd ${SRCDIR}/sys/arch/${MACHINE}/compile/${RAMDISK} && \ su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' - cp -p ${SRCDIR}/sys/arch/${MACHINE}/compile/${KERNEL}/obj/bsd obsd + cp -p ${SRCDIR}/sys/arch/${MACHINE}/compile/${RAMDISK}/obj/bsd obsd bsd.rd: obsd ${IMAGE} cp obsd bsd.rd @@ -69,9 +69,10 @@ ${IMAGE}: ${CBIN} sh ${UTILS}/runlist.sh ${LISTS} rm $@.d/${CBIN} makefs ${MAKEFSARGS_RD} $@ $@.d - vnconfig -v -c vnd0 $@ - df -i /dev/vnd0a - vnconfig -u vnd0 + vnconfig -v ${IMAGE} > vnd + df -i /dev/`cat vnd`a + vnconfig -u `cat vnd` + rm -f vnd ${CBIN}.conf: ${LISTS} awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf |