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/luna88k | |
| 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/luna88k')
| -rw-r--r-- | distrib/luna88k/ramdisk/Makefile | 8 | ||||
| -rw-r--r-- | distrib/luna88k/ramdisk/Makefile.inc | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/distrib/luna88k/ramdisk/Makefile b/distrib/luna88k/ramdisk/Makefile index 581da4c7dc3..961ce20a7ba 100644 --- a/distrib/luna88k/ramdisk/Makefile +++ b/distrib/luna88k/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2009/04/12 16:12:53 deraadt Exp $ +# $OpenBSD: Makefile,v 1.9 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -64,8 +64,10 @@ unconfig: .PRECIOUS: ${IMAGE} +.ifdef RELEASEDIR install: - cp ${BSD_RD} ${DESTDIR}/snapshot/${BSD_RD} + cp ${BSD_RD} ${RELEASEDIR} +.endif ${CBIN}.conf: ${LISTS} awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf @@ -80,7 +82,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: diff --git a/distrib/luna88k/ramdisk/Makefile.inc b/distrib/luna88k/ramdisk/Makefile.inc index 04d3894848a..3b5037a4888 100644 --- a/distrib/luna88k/ramdisk/Makefile.inc +++ b/distrib/luna88k/ramdisk/Makefile.inc @@ -1,5 +1,5 @@ # -# $OpenBSD: Makefile.inc,v 1.3 2008/01/11 10:16:40 espie Exp $ +# $OpenBSD: Makefile.inc,v 1.4 2009/04/17 03:58:54 deraadt Exp $ # # TOP is assumed to be defined by Makefile including this one. @@ -32,8 +32,8 @@ ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ - TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${UTILS}/runlist.sh ${LISTS} + REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: |