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/sgi/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/sgi/ramdisk')
-rw-r--r-- | distrib/sgi/ramdisk/Makefile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/distrib/sgi/ramdisk/Makefile b/distrib/sgi/ramdisk/Makefile index 3b3b3957607..4eb06e9de37 100644 --- a/distrib/sgi/ramdisk/Makefile +++ b/distrib/sgi/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2009/04/12 03:18:52 jsing Exp $ +# $OpenBSD: Makefile,v 1.9 2009/04/17 03:58:54 deraadt Exp $ REV= ${OSrev} @@ -71,9 +71,6 @@ unconfig: .PRECIOUS: ${IMAGE} -install: - cp ${BSD_RD} ${DESTDIR}/snapshot/ - ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} crunchgen -M -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} @@ -87,15 +84,17 @@ do_files: mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \ - sh ${TOP}/../miniroot/runlist.sh ${LISTS} + RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS} rm ${MOUNT_POINT}/${CBIN} clean cleandir: /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ *.o *.lo *.c bsd ${BSD_RD} rdsetroot -beforeinstall: - cp ${BSD.RD} ${DESTDIR}/snapshot +.ifdef RELEASEDIR +install: + cp ${BSD_RD} ${RELEASEDIR} +.endif .include <bsd.obj.mk> .include <bsd.subdir.mk> |