From e886d2ed5f458a1c669b7e01332cb294ae4cbdeb Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Fri, 17 Apr 2009 03:58:56 +0000 Subject: 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) --- etc/etc.macppc/Makefile.inc | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'etc/etc.macppc') diff --git a/etc/etc.macppc/Makefile.inc b/etc/etc.macppc/Makefile.inc index e2fdbc01d65..983ee079c8f 100644 --- a/etc/etc.macppc/Makefile.inc +++ b/etc/etc.macppc/Makefile.inc @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile.inc,v 1.10 2008/04/25 04:04:15 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.11 2009/04/17 03:58:54 deraadt Exp $ -.ifdef DESTDIR -snap_md: bsd bsd.mp bootblocks distrib gzip_bsd.rd +kernels: bsd bsd.mp bootblocks cp ${.CURDIR}/../sys/arch/macppc/compile/GENERIC/bsd \ - ${DESTDIR}/snapshot/bsd + ${RELEASEDIR}/bsd cp ${.CURDIR}/../sys/arch/macppc/compile/GENERIC.MP/bsd \ - ${DESTDIR}/snapshot/bsd.mp + ${RELEASEDIR}/bsd.mp bsd: cd ${.CURDIR}/../sys/arch/macppc/conf && config GENERIC @@ -18,14 +17,12 @@ bsd.mp: ${MAKE} clean && ${MAKE} depend && exec ${MAKE} bootblocks: - cp ${DESTDIR}/usr/mdec/ofwboot ${DESTDIR}/snapshot/ofwboot - cp ${DESTDIR}/usr/mdec/bsd.tbxi ${DESTDIR}/snapshot/bsd.tbxi - cp ${DESTDIR}/usr/mdec/boot.mac ${DESTDIR}/snapshot/boot.mac + cp ${DESTDIR}/usr/mdec/ofwboot ${RELEASEDIR}/ofwboot + cp ${DESTDIR}/usr/mdec/bsd.tbxi ${RELEASEDIR}/bsd.tbxi + cp ${DESTDIR}/usr/mdec/boot.mac ${RELEASEDIR}/boot.mac -gzip_bsd.rd: - gzip -9 ${DESTDIR}/snapshot/bsd.rd - mv ${DESTDIR}/snapshot/bsd.rd.gz ${DESTDIR}/snapshot/bsd.rd +MDEXT= bsd.mp cd${OSrev}.iso \ + ofwboot bsd.tbxi boot.mac -.PHONY: bootblocks bsd gzip_bsd.rd +.PHONY: bsd bsd.mp bootblocks -.endif # DESTDIR check -- cgit v1.2.3