summaryrefslogtreecommitdiff
path: root/etc/etc.armish
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2009-04-17 03:58:56 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2009-04-17 03:58:56 +0000
commite886d2ed5f458a1c669b7e01332cb294ae4cbdeb (patch)
treec2b4570421724d0f1f9b22228287ea4c64f5cb11 /etc/etc.armish
parentf4409ec46343690f2d8488e54a5731d75ae3a918 (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 'etc/etc.armish')
-rw-r--r--etc/etc.armish/Makefile.inc13
1 files changed, 6 insertions, 7 deletions
diff --git a/etc/etc.armish/Makefile.inc b/etc/etc.armish/Makefile.inc
index 2373edc7565..4ee665ee454 100644
--- a/etc/etc.armish/Makefile.inc
+++ b/etc/etc.armish/Makefile.inc
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile.inc,v 1.5 2006/08/30 21:40:05 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.6 2009/04/17 03:58:53 deraadt Exp $
-.ifdef DESTDIR
-snap_md: bsd bootblocks distrib
+kernels: bsd bootblocks
cp ${.CURDIR}/../sys/arch/armish/compile/GENERIC/bsd \
- ${DESTDIR}/snapshot/bsd
+ ${RELEASEDIR}/bsd
bsd:
cd ${.CURDIR}/../sys/arch/armish/conf && config GENERIC
@@ -11,8 +10,8 @@ bsd:
${MAKE} clean && ${MAKE} depend && exec ${MAKE}
bootblocks:
- cp ${DESTDIR}/usr/mdec/boot ${DESTDIR}/snapshot
+ cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}
-.PHONY: bsd bootblocks
+MDEXT=
-.endif # DESTDIR check
+.PHONY: bsd bootblocks