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/armv7 | |
| parent | ecbca7f78c1101e467df0ddb932e704fd27923f5 (diff) | |
remove the abstraction REV on top of abstraction OSrev which is always
the sme.
Diffstat (limited to 'distrib/armv7')
| -rw-r--r-- | distrib/armv7/miniroot/Makefile.inc | 4 | ||||
| -rw-r--r-- | distrib/armv7/ramdisk/Makefile | 6 | ||||
| -rw-r--r-- | distrib/armv7/ramdisk/list | 4 |
3 files changed, 5 insertions, 9 deletions
diff --git a/distrib/armv7/miniroot/Makefile.inc b/distrib/armv7/miniroot/Makefile.inc index 299cd01f402..1f211a40696 100644 --- a/distrib/armv7/miniroot/Makefile.inc +++ b/distrib/armv7/miniroot/Makefile.inc @@ -1,7 +1,5 @@ -REV= ${OSrev} - -IMAGE= miniroot-${BOARD}-${REV}.fs +IMAGE= miniroot-${BOARD}-${OSrev}.fs MKUBOOT?= mkuboot MOUNT_POINT= /mnt diff --git a/distrib/armv7/ramdisk/Makefile b/distrib/armv7/ramdisk/Makefile index d61e6432947..9950cdf7c8c 100644 --- a/distrib/armv7/ramdisk/Makefile +++ b/distrib/armv7/ramdisk/Makefile @@ -1,6 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2019/04/28 15:21:49 deraadt Exp $ - -REV= ${OSrev} +# $OpenBSD: Makefile,v 1.22 2019/04/29 01:48:39 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -49,7 +47,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/armv7/ramdisk/list b/distrib/armv7/ramdisk/list index 69fdcd98e9d..cc266188df9 100644 --- a/distrib/armv7/ramdisk/list +++ b/distrib/armv7/ramdisk/list @@ -1,4 +1,4 @@ -# $OpenBSD: list,v 1.38 2019/02/09 13:03:56 jsg Exp $ +# $OpenBSD: list,v 1.39 2019/04/29 01:48:39 deraadt Exp $ SRCDIRS distrib/special @@ -102,7 +102,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 |