summaryrefslogtreecommitdiff
path: root/distrib/vax
diff options
context:
space:
mode:
Diffstat (limited to 'distrib/vax')
-rw-r--r--distrib/vax/cdfs/Makefile6
-rw-r--r--distrib/vax/common/Makefile.inc4
-rw-r--r--distrib/vax/iso/Makefile7
3 files changed, 12 insertions, 5 deletions
diff --git a/distrib/vax/cdfs/Makefile b/distrib/vax/cdfs/Makefile
index fc3e7b167a4..d4e9fa66680 100644
--- a/distrib/vax/cdfs/Makefile
+++ b/distrib/vax/cdfs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2008/02/25 19:52:05 deraadt Exp $
+# $OpenBSD: Makefile,v 1.2 2009/04/17 03:58:55 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -9,8 +9,10 @@ CDROM= cd${REV}.iso
# The floppy image works fine as a CD image, too
+.ifdef RELEASEDIR
install:
- cp ${DESTDIR}/snapshot/${FLOPPY} ${DESTDIR}/snapshot/${CDROM}
+ cp ${RELEASEDIR}/${FLOPPY} ${RELEASEDIR}/${CDROM}
+.endif
.include <bsd.obj.mk>
.include <bsd.subdir.mk>
diff --git a/distrib/vax/common/Makefile.inc b/distrib/vax/common/Makefile.inc
index d1df15e24de..2839452e4eb 100644
--- a/distrib/vax/common/Makefile.inc
+++ b/distrib/vax/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.5 2008/01/11 10:16:40 espie Exp $
+# $OpenBSD: Makefile.inc,v 1.6 2009/04/17 03:58:55 deraadt Exp $
# TOP is assumed to be defined by Makefile including this one.
@@ -27,7 +27,7 @@ all: ${CBIN} bootroot
mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
- sh ${UTILS}/runlist.sh ${LISTS}
+ RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS}
rm ${MOUNT_POINT}/${CBIN}
@echo ""
@df -i ${MOUNT_POINT}
diff --git a/distrib/vax/iso/Makefile b/distrib/vax/iso/Makefile
index 5e753602295..9d3563171a1 100644
--- a/distrib/vax/iso/Makefile
+++ b/distrib/vax/iso/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2008/08/25 17:18:55 deraadt Exp $
+# $OpenBSD: Makefile,v 1.4 2009/04/17 03:58:55 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -53,6 +53,11 @@ ${CDROM}: ${BASE} ${XBASE} ${BOOT} ${BOOTXX}
install:
cp ${CDROM} ${RELDIR}/
+ # update the SHA256 file
+ grep -v ${CDROM} ${RELDIR}/SHA256 > ${RELDIR}/SHA256.new
+ sum -a sha256 ${CDROM} >> ${RELDIR}/SHA256.new
+ sort ${RELDIR}/SHA256.new > ${RELDIR}/SHA256
+ rm ${RELDIR}/SHA256.new
clean cleandir:
/bin/rm -f ${CDROM} ${.OBJDIR}/image.*