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/macppc/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/macppc/ramdisk')
| -rw-r--r-- | distrib/macppc/ramdisk/Makefile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/distrib/macppc/ramdisk/Makefile b/distrib/macppc/ramdisk/Makefile index 4355ee1b35c..5973d2dc54f 100644 --- a/distrib/macppc/ramdisk/Makefile +++ b/distrib/macppc/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2008/12/02 03:20:57 deraadt Exp $ +# $OpenBSD: Makefile,v 1.23 2009/04/17 03:58:54 deraadt Exp $ REV= ${OSrev} @@ -95,9 +95,6 @@ unconfig: .PRECIOUS: ${IMAGE} -install: - cp ${BSD_RD} cd${REV}.iso ${DESTDIR}/snapshot/ - ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} @@ -111,7 +108,7 @@ 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: @@ -120,8 +117,10 @@ clean cleandir: rdsetroot rm -rf cd-dir -beforeinstall: - cp ${BSD.RD} cd${REV}.iso ${DESTDIR}/snapshot +.ifdef RELEASEDIR +install: + cp ${BSD_RD} cd${REV}.iso ${RELEASEDIR} +.endif .include <bsd.obj.mk> .include <bsd.subdir.mk> |