remove the abstraction REV on top of abstraction OSrev which is always

the sme.

5 files changed, 11 insertions, 13 deletions

diff --git a/distrib/i386/Makefile.inc b/distrib/i386/Makefile.inc
index d504fb2a441..9ab174b4316 100644
--- a/distrib/i386/Makefile.inc
+++ b/distrib/i386/Makefile.inc
@@ -1,5 +1,3 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2002/04/22 02:40:02 deraadt Exp $
-
-REV=	${OSrev}
+#	$OpenBSD: Makefile.inc,v 1.2 2019/04/29 01:48:40 deraadt Exp $
 
 .include <bsd.own.mk>
diff --git a/distrib/i386/cdfs/Makefile b/distrib/i386/cdfs/Makefile
index 01ce8776783..fddfa78003b 100644
--- a/distrib/i386/cdfs/Makefile
+++ b/distrib/i386/cdfs/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.10 2019/04/28 15:32:03 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.11 2019/04/29 01:48:40 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
-CDROM=	cd${REV}.iso
+CDROM=	cd${OSrev}.iso
 
 all: ${CDROM}
 
diff --git a/distrib/i386/common/Makefile.inc b/distrib/i386/common/Makefile.inc
index 9b78c6b04b9..d854eee0b47 100644
--- a/distrib/i386/common/Makefile.inc
+++ b/distrib/i386/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.49 2019/04/28 16:47:30 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.50 2019/04/29 01:48:40 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -12,7 +12,7 @@ MOUNT_POINT=	/mnt
 MTREE=		${UTILS}/mtree.conf
 
 XNAME?=		floppy
-FS?=		${XNAME}${REV}.fs
+FS?=		${XNAME}${OSrev}.fs
 BOOT?=		${DESTDIR}/usr/mdec/boot
 FLOPPYSIZE?=	2880
 FLOPPYTYPE?=	floppy3
@@ -66,7 +66,7 @@ ${IMAGE}: instbin
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \
+	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
 	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/instbin
diff --git a/distrib/i386/common/list b/distrib/i386/common/list
index fc738afed44..9c294b4bf87 100644
--- a/distrib/i386/common/list
+++ b/distrib/i386/common/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.48 2016/12/30 22:32:25 deraadt Exp $
+#	$OpenBSD: list,v 1.49 2019/04/29 01:48:40 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -68,7 +68,7 @@ COPY	${DESTDIR}/usr/mdec/mbr			usr/mdec/mbr
 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
 TERMCAP	vt100,vt220,dumb			usr/share/misc/termcap
diff --git a/distrib/i386/iso/Makefile b/distrib/i386/iso/Makefile
index 5023b180609..1d35802e861 100644
--- a/distrib/i386/iso/Makefile
+++ b/distrib/i386/iso/Makefile
@@ -1,12 +1,12 @@
-#	$OpenBSD: Makefile,v 1.19 2019/04/28 17:35:45 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.20 2019/04/29 01:48:40 deraadt Exp $
 
 TOP=	${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 
-CDROM=		install${REV}.iso
+CDROM=		install${OSrev}.iso
 
-FS=		install${REV}.fs
+FS=		install${OSrev}.fs
 FSSIZE=		921600
 FSTYPE=		install360