summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-08-26 03:34:17 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-08-26 03:34:17 +0000
commitcda8599a2167f32e116ab2cfe6c3f909e9361008 (patch)
treeaeedc4be80609be2aa9edc3bd8cebc541d78918d /etc
parent5666d69a2bc6aadfcb03544debbd63086cf5750f (diff)
install cdbr and cdboot for those that have it, too
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile9
-rw-r--r--etc/etc.amd64/Makefile.inc4
-rw-r--r--etc/etc.i386/Makefile.inc4
3 files changed, 11 insertions, 6 deletions
diff --git a/etc/Makefile b/etc/Makefile
index d97c48b08b7..9a088715f62 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.210 2004/08/16 17:39:21 deraadt Exp $
+# $OpenBSD: Makefile,v 1.211 2004/08/26 03:34:15 deraadt Exp $
TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain
@@ -258,15 +258,16 @@ release: distribution snap_pre snap_md
cd ${.CURDIR}/../distrib/sets && exec ${SUDO} sh maketars ${OSrev}
-cp ${DESTDIR}/snapshot/bsd* ${RELEASEDIR}
-cp ${DESTDIR}/snapshot/*boot* ${RELEASEDIR}
+ -cp ${DESTDIR}/snapshot/cdbr ${RELEASEDIR}
-cp ${DESTDIR}/snapshot/*BOOT* ${RELEASEDIR}
-cp ${DESTDIR}/snapshot/cd*.iso ${RELEASEDIR}
-cp ${DESTDIR}/snapshot/INSTALL.* ${RELEASEDIR}
-cp ${DESTDIR}/snapshot/*.fs ${DESTDIR}/snapshot/*.fs.gz ${RELEASEDIR}
-cd ${RELEASEDIR}; \
- md5 bsd!(*.gz) *boot* *BOOT* INSTALL.* *.fs *.iso *.gz *.tgz \
+ md5 bsd!(*.gz) *boot* cdbr *BOOT* INSTALL.* *.fs *.iso *.gz *.tgz \
> MD5
-cd ${RELEASEDIR}; \
- cksum bsd!(*.gz) *boot* *BOOT* INSTALL.* *.fs *.iso *.gz *.tgz \
+ cksum bsd!(*.gz) *boot* cdbr *BOOT* INSTALL.* *.fs *.iso *.gz *.tgz \
> CKSUM
.if defined(MACHINE_HAS_TOOLS)
mkdir -p ${RELEASEDIR}/tools
@@ -372,7 +373,7 @@ distrib:
DHSIZE=1024 1536 2048 3072 4096
update-moduli:
( \
- echo '# $$OpenBSD: Makefile,v 1.210 2004/08/16 17:39:21 deraadt Exp $$'; \
+ echo '# $$OpenBSD: Makefile,v 1.211 2004/08/26 03:34:15 deraadt Exp $$'; \
echo '# Time Type Tests Tries Size Generator Modulus'; \
( for i in ${DHSIZE}; do \
ssh-keygen -b $$i -G /dev/stdout; \
diff --git a/etc/etc.amd64/Makefile.inc b/etc/etc.amd64/Makefile.inc
index 5aebe948c21..3e5e553a454 100644
--- a/etc/etc.amd64/Makefile.inc
+++ b/etc/etc.amd64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.5 2004/06/25 11:03:36 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.6 2004/08/26 03:34:16 deraadt Exp $
.ifdef DESTDIR
snap_md: bsd bsd.mp distrib bootblocks
@@ -19,6 +19,8 @@ bsd.mp:
bootblocks:
cp ${DESTDIR}/usr/mdec/pxeboot ${DESTDIR}/snapshot
+ cp ${DESTDIR}/usr/mdec/cdboot ${DESTDIR}/snapshot
+ cp ${DESTDIR}/usr/mdec/cdbr ${DESTDIR}/snapshot
.PHONY: bsd bootblocks
diff --git a/etc/etc.i386/Makefile.inc b/etc/etc.i386/Makefile.inc
index 0f58d9b7da1..a4af80816da 100644
--- a/etc/etc.i386/Makefile.inc
+++ b/etc/etc.i386/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.13 2004/06/13 22:05:14 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.14 2004/08/26 03:34:16 deraadt Exp $
# etc.i386/Makefile.inc -- i386-specific etc Makefile targets
.ifdef DESTDIR
@@ -23,6 +23,8 @@ notes:
bootblocks:
cp ${DESTDIR}/usr/mdec/pxeboot ${DESTDIR}/snapshot
+ cp ${DESTDIR}/usr/mdec/cdboot ${DESTDIR}/snapshot
+ cp ${DESTDIR}/usr/mdec/cdbr ${DESTDIR}/snapshot
.PHONY: bsd notes bootblocks