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

the sme.

5 files changed, 9 insertions, 15 deletions

diff --git a/distrib/loongson/Makefile.inc b/distrib/loongson/Makefile.inc
index bf37b924cbe..9ab174b4316 100644
--- a/distrib/loongson/Makefile.inc
+++ b/distrib/loongson/Makefile.inc
@@ -1,5 +1,3 @@
-#	$OpenBSD: Makefile.inc,v 1.1 2010/02/07 08:38:40 otto 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/loongson/cdfs/Makefile b/distrib/loongson/cdfs/Makefile
index fc1d376716c..d2bc5da23e3 100644
--- a/distrib/loongson/cdfs/Makefile
+++ b/distrib/loongson/cdfs/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.2 2019/04/28 15:32:03 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 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/loongson/miniroot/Makefile b/distrib/loongson/miniroot/Makefile
index 5204f2f9d12..5af6a5c9df6 100644
--- a/distrib/loongson/miniroot/Makefile
+++ b/distrib/loongson/miniroot/Makefile
@@ -1,7 +1,5 @@
 
-REV=	${OSrev}
-
-IMAGE=	miniroot${REV}.fs
+IMAGE=	miniroot${OSrev}.fs
 
 MOUNT_POINT=	/mnt
 
diff --git a/distrib/loongson/ramdisk/Makefile b/distrib/loongson/ramdisk/Makefile
index 98a763629e8..89c53e6585d 100644
--- a/distrib/loongson/ramdisk/Makefile
+++ b/distrib/loongson/ramdisk/Makefile
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile,v 1.15 2019/04/28 15:21:49 deraadt Exp $
-
-REV=	${OSrev}
+#	$OpenBSD: Makefile,v 1.16 2019/04/29 01:48:40 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -32,7 +30,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
@@ -56,7 +54,7 @@ ${CRUNCHCONF}: ${LISTS}
 
 clean cleandir:
 	/bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \
-	    lib*.a lib*.olist instbin.map *.o *.lo *.c bsd bsd.rd cd${REV}.iso
+	    lib*.a lib*.olist instbin.map *.o *.lo *.c bsd bsd.rd cd${OSrev}.iso
 	rm -rf cd-dir ${IMAGE}.d
 
 .ifdef RELEASEDIR
diff --git a/distrib/loongson/ramdisk/list b/distrib/loongson/ramdisk/list
index d2da5605e13..0eaa67b1611 100644
--- a/distrib/loongson/ramdisk/list
+++ b/distrib/loongson/ramdisk/list
@@ -1,4 +1,4 @@
-#	$OpenBSD: list,v 1.31 2017/11/19 12:11:53 job Exp $
+#	$OpenBSD: list,v 1.32 2019/04/29 01:48:40 deraadt Exp $
 
 SRCDIRS distrib/special
 
@@ -76,7 +76,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
 SYMLINK	/tmp/i/fstab.shadow			etc/fstab