diff options
| author |   deraadt <deraadt@openbsd.org> | 2019-04-29 01:48:39 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2019-04-29 01:48:39 +0000 |
| commit | 88e2a9b1fe2cf03f930356a99b4cba91e919796f (patch) | |
| tree | 555845ec585a9b63a5039e34d6b99443e63dfd3d /distrib/arm64 | |
| parent | Update to reflect change of default ruby version to ruby 2.6 (diff) | |
| download | wireguard-openbsd-88e2a9b1fe2cf03f930356a99b4cba91e919796f.tar.xz wireguard-openbsd-88e2a9b1fe2cf03f930356a99b4cba91e919796f.zip | |
remove the abstraction REV on top of abstraction OSrev which is always
the sme.
Diffstat (limited to 'distrib/arm64')
| -rw-r--r-- | distrib/arm64/miniroot/Makefile | 4 | ||||
| -rw-r--r-- | distrib/arm64/ramdisk/Makefile | 6 | ||||
| -rw-r--r-- | distrib/arm64/ramdisk/list | 4 |
3 files changed, 5 insertions, 9 deletions
diff --git a/distrib/arm64/miniroot/Makefile b/distrib/arm64/miniroot/Makefile index 6b1c0455a89..6175dea95ea 100644 --- a/distrib/arm64/miniroot/Makefile +++ b/distrib/arm64/miniroot/Makefile @@ -1,7 +1,5 @@ -REV= ${OSrev} - -IMAGE= miniroot${REV}.fs +IMAGE= miniroot${OSrev}.fs MOUNT_POINT= /mnt diff --git a/distrib/arm64/ramdisk/Makefile b/distrib/arm64/ramdisk/Makefile index 4ab90a5835a..98f5950075b 100644 --- a/distrib/arm64/ramdisk/Makefile +++ b/distrib/arm64/ramdisk/Makefile @@ -1,6 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2019/04/28 15:32:03 deraadt Exp $ - -REV= ${OSrev} +# $OpenBSD: Makefile,v 1.9 2019/04/29 01:48:39 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -43,7 +41,7 @@ ${IMAGE}: instbin mkdir -p $@.d/usr/mdec/${DIR} .endfor 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/arm64/ramdisk/list b/distrib/arm64/ramdisk/list index a316f220b45..f85de33c14d 100644 --- a/distrib/arm64/ramdisk/list +++ b/distrib/arm64/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.8 2018/03/21 19:16:06 sthen Exp $ +# $OpenBSD: list,v 1.9 2019/04/29 01:48:39 deraadt Exp $ SRCDIRS distrib/special @@ -101,7 +101,7 @@ SPECIAL cd dev; sh MAKEDEV ramdisk 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 |