summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2014-03-02 05:46:27 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2014-03-02 05:46:27 +0000
commitfcffdde3c0f1d6a199efaf0e153efa54b5681ecc (patch)
tree8cd3213c5f24861973086e192f8b3304d92d8406
parentaaacaefd8a5dd9d0c573bb290a5100cab2c0bd7b (diff)
Unfortunately... the "full-size downloadable" ISOs will ship without
internal-signing, because the procedures ran into some snags we can't fix in time for release...
Diffstat
-rw-r--r--distrib/alpha/iso/Makefile8
-rw-r--r--distrib/amd64/iso/Makefile8
-rw-r--r--distrib/hppa/iso/Makefile8
-rw-r--r--distrib/i386/iso/Makefile8
-rw-r--r--distrib/macppc/iso/Makefile8
-rw-r--r--distrib/sgi/iso/Makefile8
-rw-r--r--distrib/sparc/iso/Makefile8
-rw-r--r--distrib/sparc64/iso/Makefile8
-rw-r--r--distrib/vax/iso/Makefile8
9 files changed, 45 insertions, 27 deletions
diff --git a/distrib/alpha/iso/Makefile b/distrib/alpha/iso/Makefile
index f860ab43497..a690bd540c5 100644
--- a/distrib/alpha/iso/Makefile
+++ b/distrib/alpha/iso/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2014/02/03 05:35:40 miod Exp $
+# $OpenBSD: Makefile,v 1.13 2014/03/02 05:46:24 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -25,8 +25,10 @@ ${CDROM}: ${BASE} ${XBASE}
cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
- cp -p ${RELDIR}/.i-SHA256 ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
- cp -p ${RELDIR}/.i-SHA256.sig ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256.sig
+
+ cat ${RELDIR}/SHA256 ${RELXDIR}/SHA256 > \
+ ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
+ # XXX no SHA256.sig
# make sure right kernel is in /
ln ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/bsd.rd ${.OBJDIR}/cd-dir/bsd.rd
diff --git a/distrib/amd64/iso/Makefile b/distrib/amd64/iso/Makefile
index e7f59974622..46f3c29b077 100644
--- a/distrib/amd64/iso/Makefile
+++ b/distrib/amd64/iso/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2014/01/24 00:34:22 deraadt Exp $
+# $OpenBSD: Makefile,v 1.9 2014/03/02 05:46:26 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -27,8 +27,10 @@ ${CDROM}: ${BASE} ${XBASE}
cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
- cp -p ${RELDIR}/.i-SHA256 ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
- cp -p ${RELDIR}/.i-SHA256.sig ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256.sig
+
+ cat ${RELDIR}/SHA256 ${RELXDIR}/SHA256 > \
+ ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
+ # XXX no SHA256.sig
cp -p ${RELDIR}/cdbr ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
cp -p ${RELDIR}/cdboot ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/cdboot
diff --git a/distrib/hppa/iso/Makefile b/distrib/hppa/iso/Makefile
index 09301b68b2f..1da9b6ea3bd 100644
--- a/distrib/hppa/iso/Makefile
+++ b/distrib/hppa/iso/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2014/01/24 00:34:22 deraadt Exp $
+# $OpenBSD: Makefile,v 1.12 2014/03/02 05:46:26 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -25,8 +25,10 @@ ${CDROM}: ${BASE} ${XBASE}
cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
- cp -p ${RELDIR}/.i-SHA256 ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
- cp -p ${RELDIR}/.i-SHA256.sig ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256.sig
+
+ cat ${RELDIR}/SHA256 ${RELXDIR}/SHA256 > \
+ ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
+ # XXX no SHA256.sig
ln -f ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/bsd.rd \
${.OBJDIR}/cd-dir/bsd.rd
diff --git a/distrib/i386/iso/Makefile b/distrib/i386/iso/Makefile
index dcc8e2cfc40..f152c112ba4 100644
--- a/distrib/i386/iso/Makefile
+++ b/distrib/i386/iso/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2014/01/24 00:34:22 deraadt Exp $
+# $OpenBSD: Makefile,v 1.9 2014/03/02 05:46:26 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -27,8 +27,10 @@ ${CDROM}: ${BASE} ${XBASE}
cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
- cp -p ${RELDIR}/.i-SHA256 ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
- cp -p ${RELDIR}/.i-SHA256.sig ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256.sig
+
+ cat ${RELDIR}/SHA256 ${RELXDIR}/SHA256 > \
+ ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
+ # XXX no SHA256.sig
cp -p ${RELDIR}/cdbr ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
cp -p ${RELDIR}/cdboot ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/cdboot
diff --git a/distrib/macppc/iso/Makefile b/distrib/macppc/iso/Makefile
index d7b01e49a92..06e5da45928 100644
--- a/distrib/macppc/iso/Makefile
+++ b/distrib/macppc/iso/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2014/01/24 00:34:22 deraadt Exp $
+# $OpenBSD: Makefile,v 1.11 2014/03/02 05:46:26 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -25,8 +25,10 @@ ${CDROM}: ${BASE} ${XBASE}
cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
- cp -p ${RELDIR}/.i-SHA256 ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
- cp -p ${RELDIR}/.i-SHA256.sig ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256.sig
+
+ cat ${RELDIR}/SHA256 ${RELXDIR}/SHA256 > \
+ ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
+ # XXX no SHA256.sig
cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/stand/tbxidata/bsd.tbxi \
${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
diff --git a/distrib/sgi/iso/Makefile b/distrib/sgi/iso/Makefile
index a3e859b011d..020f65a34c1 100644
--- a/distrib/sgi/iso/Makefile
+++ b/distrib/sgi/iso/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2014/01/24 00:34:22 deraadt Exp $
+# $OpenBSD: Makefile,v 1.22 2014/03/02 05:46:26 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -90,8 +90,10 @@ ${CDROM}:
cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
- cp -p ${RELDIR}/.i-SHA256 ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
- cp -p ${RELDIR}/.i-SHA256.sig ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256.sig
+
+ cat ${RELDIR}/SHA256 ${RELXDIR}/SHA256 > \
+ ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
+ # XXX no SHA256.sig
.for IP in ${ALLIP}
ln -f ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/bsd.rd.IP${IP} \
diff --git a/distrib/sparc/iso/Makefile b/distrib/sparc/iso/Makefile
index a80f28b4ea5..fa25cdba8d6 100644
--- a/distrib/sparc/iso/Makefile
+++ b/distrib/sparc/iso/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2014/01/24 00:34:22 deraadt Exp $
+# $OpenBSD: Makefile,v 1.12 2014/03/02 05:46:26 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -25,8 +25,10 @@ ${CDROM}: ${BASE} ${XBASE}
cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
- cp -p ${RELDIR}/.i-SHA256 ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
- cp -p ${RELDIR}/.i-SHA256.sig ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256.sig
+
+ cat ${RELDIR}/SHA256 ${RELXDIR}/SHA256 > \
+ ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
+ # XXX no SHA256.sig
ln -f ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/bsd.rd ${.OBJDIR}/cd-dir/bsd.rd
ln -f ${.OBJDIR}/cd-dir/bsd.rd ${.OBJDIR}/cd-dir/bsd
diff --git a/distrib/sparc64/iso/Makefile b/distrib/sparc64/iso/Makefile
index 98253bce84a..fb048176714 100644
--- a/distrib/sparc64/iso/Makefile
+++ b/distrib/sparc64/iso/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2014/01/24 00:34:22 deraadt Exp $
+# $OpenBSD: Makefile,v 1.14 2014/03/02 05:46:26 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -25,8 +25,10 @@ ${CDROM}: ${BASE} ${XBASE}
cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
- cp -p ${RELDIR}/.i-SHA256 ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
- cp -p ${RELDIR}/.i-SHA256.sig ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256.sig
+
+ cat ${RELDIR}/SHA256 ${RELXDIR}/SHA256 > \
+ ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
+ # XXX no SHA256.sig
cp -p ${RELDIR}/ofwboot ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
diff --git a/distrib/vax/iso/Makefile b/distrib/vax/iso/Makefile
index e62b87265c0..36538819041 100644
--- a/distrib/vax/iso/Makefile
+++ b/distrib/vax/iso/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2014/02/28 22:53:06 deraadt Exp $
+# $OpenBSD: Makefile,v 1.13 2014/03/02 05:46:26 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -44,8 +44,10 @@ ${CDROM}: ${BASE} ${XBASE} ${BOOT} ${BOOTXX}
cp -p ${BASE} ${MOUNT_POINT}/${OSREV}/${MACHINE}
cp -p ${XBASE} ${MOUNT_POINT}/${OSREV}/${MACHINE}
- cp -p ${RELDIR}/.i-SHA256 ${MOUNT_POINT}/${OSREV}/${MACHINE}/SHA256
- cp -p ${RELDIR}/.i-SHA256.sig ${MOUNT_POINT}/${OSREV}/${MACHINE}/SHA256.sig
+
+ cat ${RELDIR}/SHA256 ${RELXDIR}/SHA256 > \
+ ${MOUNT_POINT}/${OSREV}/${MACHINE}/SHA256
+ # XXX no SHA256.sig
disklabel -B -b ${BOOTXX} ${VND}
@echo ""
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 01:54:44 +0000