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/i386 | |
| 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/i386')
| -rw-r--r-- | distrib/i386/cdfs-emu/Makefile | 6 | ||||
| -rw-r--r-- | distrib/i386/cdfs/Makefile | 6 | ||||
| -rw-r--r-- | distrib/i386/common/Makefile.inc | 10 | ||||
| -rw-r--r-- | distrib/i386/iso/Makefile | 7 |
4 files changed, 20 insertions, 9 deletions
diff --git a/distrib/i386/cdfs-emu/Makefile b/distrib/i386/cdfs-emu/Makefile index 8888cb9c73e..e312c0b5a50 100644 --- a/distrib/i386/cdfs-emu/Makefile +++ b/distrib/i386/cdfs-emu/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2005/03/11 15:40:58 deraadt Exp $ +# $OpenBSD: Makefile,v 1.3 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -21,8 +21,10 @@ ${CDROM}: -b ${OSREV}/i386/${CDFS} -c ${OSREV}/i386/boot.catalog \ ${.OBJDIR}/cd-dir +.ifdef RELEASEDIR install: - cp ${CDROM} ${DESTDIR}/snapshot + cp ${CDROM} ${RELEASEDIR} +.endif # RELEASEDIR check clean cleandir: /bin/rm -f ${CDROM} diff --git a/distrib/i386/cdfs/Makefile b/distrib/i386/cdfs/Makefile index 451af57c325..b0996f42e48 100644 --- a/distrib/i386/cdfs/Makefile +++ b/distrib/i386/cdfs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2005/03/11 15:40:58 deraadt Exp $ +# $OpenBSD: Makefile,v 1.8 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -25,8 +25,10 @@ ${CDROM}: -b ${OSREV}/i386/cdbr -c ${OSREV}/i386/boot.catalog \ ${.OBJDIR}/cd-dir +.ifdef RELEASEDIR install: - cp ${CDROM} ${DESTDIR}/snapshot + cp ${CDROM} ${RELEASEDIR} +.endif # RELEASEDIR check clean cleandir: /bin/rm -f ${CDROM} diff --git a/distrib/i386/common/Makefile.inc b/distrib/i386/common/Makefile.inc index 4ba45639e61..e8ed9f86b3f 100644 --- a/distrib/i386/common/Makefile.inc +++ b/distrib/i386/common/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.23 2008/12/02 03:20:57 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.24 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -95,13 +95,15 @@ unconfig: .PRECIOUS: ${IMAGE} +.ifdef RELEASEDIR install: .ifndef NOBSDRD - cp bsd.rd ${DESTDIR}/snapshot/bsd.rd + cp bsd.rd ${RELEASEDIR}/bsd.rd .endif .ifndef NOFS - cp ${FS} ${DESTDIR}/snapshot/${FS} + cp ${FS} ${RELEASEDIR}/${FS} .endif +.endif # RELEASEDIR check ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} crunchgen -E -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib \ @@ -118,7 +120,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/i386/iso/Makefile b/distrib/i386/iso/Makefile index fca84d0018e..4224e6e6b1d 100644 --- a/distrib/i386/iso/Makefile +++ b/distrib/i386/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2008/08/25 17:18:55 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2009/04/17 03:58:54 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -41,6 +41,11 @@ ${CDROM}: ${BASE} ${XBASE} 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} |