diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-04-17 03:58:56 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-04-17 03:58:56 +0000 |
commit | e886d2ed5f458a1c669b7e01332cb294ae4cbdeb (patch) | |
tree | c2b4570421724d0f1f9b22228287ea4c64f5cb11 /distrib/hp300/ramdisk | |
parent | f4409ec46343690f2d8488e54a5731d75ae3a918 (diff) |
For SHA256 hashes to be ready to go onto the install media, we must
build the sets before we build the media. While there we can get rid
of DESTDIR/snapshot too, and simply install straight into RELEASEDIR.
(This also ends up saving an astounding amount of traffic/latency in a nfs
environment)
Diffstat (limited to 'distrib/hp300/ramdisk')
-rw-r--r-- | distrib/hp300/ramdisk/Makefile | 6 | ||||
-rw-r--r-- | distrib/hp300/ramdisk/Makefile.inc | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/distrib/hp300/ramdisk/Makefile b/distrib/hp300/ramdisk/Makefile index abc572ff309..b20546646e6 100644 --- a/distrib/hp300/ramdisk/Makefile +++ b/distrib/hp300/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2008/12/02 03:20:57 deraadt Exp $ +# $OpenBSD: Makefile,v 1.27 2009/04/17 03:58:54 deraadt Exp $ # $NetBSD: Makefile,v 1.1 1995/07/18 04:13:06 briggs Exp $ TOP= ${.CURDIR}/.. @@ -22,8 +22,10 @@ GZIPFLAGS?= -9fn all: ${CBIN} ${IMAGE} bsd.rd +.ifdef RELEASEDIR install: bsd.rd - ${GZIPCMD} -c ${GZIPFLAGS} bsd.rd > ${DESTDIR}/snapshot/bsd.rd + ${GZIPCMD} -c ${GZIPFLAGS} bsd.rd > ${RELEASEDIR}/bsd.rd +.endif .include "Makefile.inc" diff --git a/distrib/hp300/ramdisk/Makefile.inc b/distrib/hp300/ramdisk/Makefile.inc index 3b963eba68d..583eaf4139b 100644 --- a/distrib/hp300/ramdisk/Makefile.inc +++ b/distrib/hp300/ramdisk/Makefile.inc @@ -1,5 +1,5 @@ # -# $OpenBSD: Makefile.inc,v 1.7 2008/01/11 10:16:40 espie Exp $ +# $OpenBSD: Makefile.inc,v 1.8 2009/04/17 03:58:54 deraadt Exp $ # $NetBSD: Makefile.inc,v 1.1 1995/07/18 04:13:14 briggs Exp $ # @@ -28,7 +28,7 @@ do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${UTILS}/runlist.sh ${LISTS} + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: |