summaryrefslogtreecommitdiff
path: root/etc/etc.landisk/Makefile.inc
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.landisk/Makefile.inc
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.landisk/Makefile.inc')
-rw-r--r--etc/etc.landisk/Makefile.inc17
1 files changed, 8 insertions, 9 deletions
diff --git a/etc/etc.landisk/Makefile.inc b/etc/etc.landisk/Makefile.inc
index 8e2df705da4..0e7198c04a4 100644
--- a/etc/etc.landisk/Makefile.inc
+++ b/etc/etc.landisk/Makefile.inc
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile.inc,v 1.2 2006/11/12 21:45:19 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.3 2009/04/17 03:58:54 deraadt Exp $
-.ifdef DESTDIR
-snap_md: bsd bootblocks distrib
+kernels: bsd bootblocks
cp ${.CURDIR}/../sys/arch/landisk/compile/GENERIC/bsd \
- ${DESTDIR}/snapshot/bsd
+ ${RELEASEDIR}/bsd
bsd:
cd ${.CURDIR}/../sys/arch/landisk/conf && config GENERIC
@@ -12,10 +11,10 @@ bsd:
# probably will be replaced by procedure to build 'miniroot' image
bootblocks:
- cp ${DESTDIR}/usr/mdec/mbr ${DESTDIR}/snapshot
- cp ${DESTDIR}/usr/mdec/xxboot ${DESTDIR}/snapshot
- cp ${DESTDIR}/usr/mdec/boot ${DESTDIR}/snapshot
+ cp ${DESTDIR}/usr/mdec/mbr ${RELEASEDIR}
+ cp ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR}
+ cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}
-.PHONY: bsd bootblocks
+MDEXT=
-.endif # DESTDIR check
+.PHONY: bsd bootblocks