diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-04-29 01:48:42 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-04-29 01:48:42 +0000 |
| commit | 063c90a6588489ddfb0f62c5144987d7e5b6e1ad (patch) | |
| tree | f44fe59282010ee146b567362075731ad08a9108 /distrib/hppa | |
| parent | ecbca7f78c1101e467df0ddb932e704fd27923f5 (diff) | |
remove the abstraction REV on top of abstraction OSrev which is always
the sme.
Diffstat (limited to 'distrib/hppa')
| -rw-r--r-- | distrib/hppa/Makefile.inc | 3 | ||||
| -rw-r--r-- | distrib/hppa/iso/Makefile | 4 | ||||
| -rw-r--r-- | distrib/hppa/list | 4 | ||||
| -rw-r--r-- | distrib/hppa/ramdisk/Makefile | 10 |
4 files changed, 10 insertions, 11 deletions
diff --git a/distrib/hppa/Makefile.inc b/distrib/hppa/Makefile.inc index 9aec5f464d0..ae30927ef90 100644 --- a/distrib/hppa/Makefile.inc +++ b/distrib/hppa/Makefile.inc @@ -1,3 +1,2 @@ -# $OpenBSD: Makefile.inc,v 1.1 2003/01/30 21:05:00 mickey Exp $ +# $OpenBSD: Makefile.inc,v 1.2 2019/04/29 01:48:39 deraadt Exp $ -REV=${OSrev} diff --git a/distrib/hppa/iso/Makefile b/distrib/hppa/iso/Makefile index 5ffa812558b..971bb584691 100644 --- a/distrib/hppa/iso/Makefile +++ b/distrib/hppa/iso/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.15 2019/04/28 14:48:10 deraadt Exp $ +# $OpenBSD: Makefile,v 1.16 2019/04/29 01:48:40 deraadt Exp $ TOP= ${.CURDIR}/.. .include "${TOP}/Makefile.inc" -CDROM= install${REV}.iso +CDROM= install${OSrev}.iso RELXDIR?= /home/relx-${MACHINE} RELDIR?= /home/rel-${MACHINE} diff --git a/distrib/hppa/list b/distrib/hppa/list index fa00ccb0f23..d43ed5bdbd5 100644 --- a/distrib/hppa/list +++ b/distrib/hppa/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.41 2018/03/21 19:16:06 sthen Exp $ +# $OpenBSD: list,v 1.42 2019/04/29 01:48:39 deraadt Exp $ SRCDIRS distrib/special @@ -64,7 +64,7 @@ SPECIAL rm usr/bin/ftp-ssl COPY ${CURDIR}/../../miniroot/group etc/group COPY ${CURDIR}/../../miniroot/master.passwd etc/master.passwd SPECIAL pwd_mkdb -p -d etc master.passwd; rm etc/master.passwd -COPY ${DESTDIR}/etc/signify/openbsd-${REV}-base.pub etc/signify/openbsd-${REV}-base.pub +COPY ${DESTDIR}/etc/signify/openbsd-${OSrev}-base.pub etc/signify/openbsd-${OSrev}-base.pub COPY ${CURDIR}/../../miniroot/protocols etc/protocols COPY ${CURDIR}/../../miniroot/services etc/services diff --git a/distrib/hppa/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile index 1ba07e164e2..8b70ac71c78 100644 --- a/distrib/hppa/ramdisk/Makefile +++ b/distrib/hppa/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.39 2019/04/28 16:26:07 deraadt Exp $ +# $OpenBSD: Makefile,v 1.40 2019/04/29 01:48:40 deraadt Exp $ ARCHDIR= ${.CURDIR}/.. SRCDIR= ${.CURDIR}/../../.. @@ -9,7 +9,7 @@ SRCDIR= ${.CURDIR}/../../.. .include "${ARCHDIR}/Makefile.inc" .endif -IMAGE?= ramdisk${REV}.fs +IMAGE?= ramdisk${OSrev}.fs CRUNCHGENOPTS?=-E RAMDISK?= RAMDISK UTILS?= ${.CURDIR}/../../miniroot @@ -17,8 +17,8 @@ UTILS?= ${.CURDIR}/../../miniroot LISTS= ${ARCHDIR}/list ${.CURDIR}/list.local MTREE= ${UTILS}/mtree.conf -LIF?= lif${REV}.fs -CDROM?= cd${REV}.iso +LIF?= lif${OSrev}.fs +CDROM?= cd${OSrev}.iso MKBOOT?= /usr/mdec/mkboot BOOT?= ${DESTDIR}/usr/mdec/boot CDBOOT?= ${DESTDIR}/usr/mdec/cdboot @@ -62,7 +62,7 @@ ${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u - CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} ARCHDIR=${ARCHDIR} \ + CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} ARCHDIR=${ARCHDIR} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} rm $@.d/instbin |