summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2014-01-24 00:34:23 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2014-01-24 00:34:23 +0000
commit189a68eb2491431973e791e4ed02945ac3ea1512 (patch)
treefb1af5c2e70a4c2669b35ab4fe14c629b248f4e3
parent66a2da9ccd84e6017712e1ab1e0bf0043eed5489 (diff)
Refactor the install*.iso creation in regards to signing.
ok todd
Diffstat
-rw-r--r--distrib/alpha/iso/Makefile12
-rw-r--r--distrib/amd64/iso/Makefile11
-rw-r--r--distrib/hppa/iso/Makefile12
-rw-r--r--distrib/i386/iso/Makefile12
-rw-r--r--distrib/macppc/iso/Makefile11
-rw-r--r--distrib/sgi/iso/Makefile15
-rw-r--r--distrib/sparc/iso/Makefile14
-rw-r--r--distrib/sparc64/iso/Makefile12
-rw-r--r--distrib/vax/iso/Makefile13
9 files changed, 31 insertions, 81 deletions
diff --git a/distrib/alpha/iso/Makefile b/distrib/alpha/iso/Makefile
index 284cde46c00..c1ed34a72ff 100644
--- a/distrib/alpha/iso/Makefile
+++ b/distrib/alpha/iso/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2014/01/12 21:57:59 deraadt Exp $
+# $OpenBSD: Makefile,v 1.11 2014/01/24 00:34:22 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -25,6 +25,8 @@ ${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
# make sure right kernel is in /
ln ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/bsd.rd ${.OBJDIR}/cd-dir/bsd.rd
@@ -33,9 +35,6 @@ ${CDROM}: ${BASE} ${XBASE}
cp -p ${RELDIR}/boot ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
cp -p ${RELDIR}/bootxx ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
- cat ${RELDIR}/SHA256 ${RELXDIR}/SHA256 > \
- ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
-
(mkhybrid -a -R -v -v -T -L -d -D -N -o ${.OBJDIR}/${CDROM} \
-A "OpenBSD ${OSREV} ${MACHINE} Install CD" \
-P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
@@ -53,11 +52,6 @@ ${CDROM}: ${BASE} ${XBASE}
install:
cp ${CDROM} ${RELDIR}/
- # update the SHA256 file
- grep -v ${CDROM} ${RELDIR}/SHA256 > ${RELDIR}/SHA256.new
- sum -a sha256 ${CDROM} >> ${RELDIR}/SHA256.new
- sort ${RELDIR}/SHA256.new > ${RELDIR}/SHA256
- rm ${RELDIR}/SHA256.new
clean cleandir:
/bin/rm -f ${CDROM}
diff --git a/distrib/amd64/iso/Makefile b/distrib/amd64/iso/Makefile
index 15069c3953b..e7f59974622 100644
--- a/distrib/amd64/iso/Makefile
+++ b/distrib/amd64/iso/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2014/01/12 21:58:00 deraadt Exp $
+# $OpenBSD: Makefile,v 1.8 2014/01/24 00:34:22 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -27,12 +27,12 @@ ${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
cp -p ${RELDIR}/cdbr ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
cp -p ${RELDIR}/cdboot ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/cdboot
- cat ${RELDIR}/SHA256 ${RELXDIR}/SHA256 > \
- ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} -v -v \
-A "OpenBSD ${OSREV} ${MACHINE} Install CD" \
@@ -44,11 +44,6 @@ ${CDROM}: ${BASE} ${XBASE}
install:
cp ${CDROM} ${RELDIR}/
- # update the SHA256 file
- grep -v ${CDROM} ${RELDIR}/SHA256 > ${RELDIR}/SHA256.new
- sum -a sha256 ${CDROM} >> ${RELDIR}/SHA256.new
- sort ${RELDIR}/SHA256.new > ${RELDIR}/SHA256
- rm ${RELDIR}/SHA256.new
clean cleandir:
/bin/rm -f ${CDROM}
diff --git a/distrib/hppa/iso/Makefile b/distrib/hppa/iso/Makefile
index 912688a60de..09301b68b2f 100644
--- a/distrib/hppa/iso/Makefile
+++ b/distrib/hppa/iso/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2014/01/12 21:58:00 deraadt Exp $
+# $OpenBSD: Makefile,v 1.11 2014/01/24 00:34:22 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -25,9 +25,8 @@ ${CDROM}: ${BASE} ${XBASE}
cp -p ${BASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
-
- cat ${RELDIR}/SHA256 ${RELXDIR}/SHA256 > \
- ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
+ cp -p ${RELDIR}/.i-SHA256 ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
+ cp -p ${RELDIR}/.i-SHA256.sig ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256.sig
ln -f ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/bsd.rd \
${.OBJDIR}/cd-dir/bsd.rd
@@ -44,11 +43,6 @@ ${CDROM}: ${BASE} ${XBASE}
install:
cp ${CDROM} ${RELDIR}/
- # update the SHA256 file
- grep -v ${CDROM} ${RELDIR}/SHA256 > ${RELDIR}/SHA256.new
- sum -a sha256 ${CDROM} >> ${RELDIR}/SHA256.new
- sort ${RELDIR}/SHA256.new > ${RELDIR}/SHA256
- rm ${RELDIR}/SHA256.new
clean cleandir:
/bin/rm -rf cd-dir ${CDROM}
diff --git a/distrib/i386/iso/Makefile b/distrib/i386/iso/Makefile
index 8da79ff1976..dcc8e2cfc40 100644
--- a/distrib/i386/iso/Makefile
+++ b/distrib/i386/iso/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2014/01/12 21:58:00 deraadt Exp $
+# $OpenBSD: Makefile,v 1.8 2014/01/24 00:34:22 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -27,13 +27,12 @@ ${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
cp -p ${RELDIR}/cdbr ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
cp -p ${RELDIR}/cdboot ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/cdboot
- cat ${RELDIR}/SHA256 ${RELXDIR}/SHA256 > \
- ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
-
mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} -v -v \
-A "OpenBSD ${OSREV} ${MACHINE} Install CD" \
-P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
@@ -44,11 +43,6 @@ ${CDROM}: ${BASE} ${XBASE}
install:
cp ${CDROM} ${RELDIR}/
- # update the SHA256 file
- grep -v ${CDROM} ${RELDIR}/SHA256 > ${RELDIR}/SHA256.new
- sum -a sha256 ${CDROM} >> ${RELDIR}/SHA256.new
- sort ${RELDIR}/SHA256.new > ${RELDIR}/SHA256
- rm ${RELDIR}/SHA256.new
clean cleandir:
/bin/rm -f ${CDROM}
diff --git a/distrib/macppc/iso/Makefile b/distrib/macppc/iso/Makefile
index 9291bc15746..d7b01e49a92 100644
--- a/distrib/macppc/iso/Makefile
+++ b/distrib/macppc/iso/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2014/01/12 21:58:00 deraadt Exp $
+# $OpenBSD: Makefile,v 1.10 2014/01/24 00:34:22 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -25,13 +25,13 @@ ${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
cp -p ${.CURDIR}/../../../sys/arch/${MACHINE}/stand/tbxidata/bsd.tbxi \
${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
cp -p ${RELDIR}/ofwboot ${.OBJDIR}/cd-dir/
- cat ${RELDIR}/SHA256 ${RELXDIR}/SHA256 > \
- ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
mkhybrid -v -v -r -part -hfs \
-hfs-bless ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE} \
@@ -44,11 +44,6 @@ ${CDROM}: ${BASE} ${XBASE}
install:
cp ${CDROM} ${RELDIR}/
- # update the SHA256 file
- grep -v ${CDROM} ${RELDIR}/SHA256 > ${RELDIR}/SHA256.new
- sum -a sha256 ${CDROM} >> ${RELDIR}/SHA256.new
- sort ${RELDIR}/SHA256.new > ${RELDIR}/SHA256
- rm ${RELDIR}/SHA256.new
clean cleandir:
/bin/rm -f ${CDROM}
diff --git a/distrib/sgi/iso/Makefile b/distrib/sgi/iso/Makefile
index 7689559e9f8..a3e859b011d 100644
--- a/distrib/sgi/iso/Makefile
+++ b/distrib/sgi/iso/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2014/01/12 21:58:00 deraadt Exp $
+# $OpenBSD: Makefile,v 1.21 2014/01/24 00:34:22 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -89,17 +89,15 @@ ${CDROM}:
ln ${.OBJDIR}/cd-dir/boot32 ${.OBJDIR}/cd-dir/boot-IP32
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
.for IP in ${ALLIP}
ln -f ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/bsd.rd.IP${IP} \
${.OBJDIR}/cd-dir/bsd.rd.IP${IP}
.endfor
- cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
-
- cat ${RELDIR}/SHA256 ${RELXDIR}/SHA256 > \
- ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
-
umount ${.OBJDIR}/cd-dir
# Summary
@@ -110,11 +108,6 @@ ${CDROM}:
install:
cp ${CDROM} ${RELDIR}/
- # update the SHA256 file
- grep -v ${CDROM} ${RELDIR}/SHA256 > ${RELDIR}/SHA256.new
- sum -a sha256 ${CDROM} >> ${RELDIR}/SHA256.new
- sort ${RELDIR}/SHA256.new > ${RELDIR}/SHA256
- rm ${RELDIR}/SHA256.new
unconfig:
-umount /mnt
diff --git a/distrib/sparc/iso/Makefile b/distrib/sparc/iso/Makefile
index b9d9afd7e3c..a80f28b4ea5 100644
--- a/distrib/sparc/iso/Makefile
+++ b/distrib/sparc/iso/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2014/01/12 21:58:00 deraadt Exp $
+# $OpenBSD: Makefile,v 1.11 2014/01/24 00:34:22 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -25,18 +25,17 @@ ${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
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
ln -f ${.OBJDIR}/cd-dir/bsd.rd ${.OBJDIR}/cd-dir/vmunix # for kicks
cp ${RELDIR}/boot ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
-
- cat ${RELDIR}/SHA256 ${RELXDIR}/SHA256 > \
- ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
-
cp ${RELDIR}/bootxx ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
+
(mkhybrid -a -R -v -v -T -L -d -D -N -o ${.OBJDIR}/${CDROM} \
-A "OpenBSD ${OSREV} ${MACHINE} Install CD" \
-P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \
@@ -59,11 +58,6 @@ ${CDROM}: ${BASE} ${XBASE}
install:
cp ${CDROM} ${RELDIR}/
- # update the SHA256 file
- grep -v ${CDROM} ${RELDIR}/SHA256 > ${RELDIR}/SHA256.new
- sum -a sha256 ${CDROM} >> ${RELDIR}/SHA256.new
- sort ${RELDIR}/SHA256.new > ${RELDIR}/SHA256
- rm ${RELDIR}/SHA256.new
clean cleandir:
/bin/rm -f ${CDROM}
diff --git a/distrib/sparc64/iso/Makefile b/distrib/sparc64/iso/Makefile
index 5660c02a858..98253bce84a 100644
--- a/distrib/sparc64/iso/Makefile
+++ b/distrib/sparc64/iso/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2014/01/12 21:58:00 deraadt Exp $
+# $OpenBSD: Makefile,v 1.13 2014/01/24 00:34:22 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -25,12 +25,11 @@ ${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
cp -p ${RELDIR}/ofwboot ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}
- cat ${RELDIR}/SHA256 ${RELXDIR}/SHA256 > \
- ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
-
echo 'm 1 sun4' > ${.OBJDIR}/cd-dir/.slicemapfile
echo 'm 2 sun4c' >> ${.OBJDIR}/cd-dir/.slicemapfile
echo 'm 3 sun4m' >> ${.OBJDIR}/cd-dir/.slicemapfile
@@ -51,11 +50,6 @@ ${CDROM}: ${BASE} ${XBASE}
install:
cp ${CDROM} ${RELDIR}/
- # update the SHA256 file
- grep -v ${CDROM} ${RELDIR}/SHA256 > ${RELDIR}/SHA256.new
- sum -a sha256 ${CDROM} >> ${RELDIR}/SHA256.new
- sort ${RELDIR}/SHA256.new > ${RELDIR}/SHA256
- rm ${RELDIR}/SHA256.new
clean cleandir:
/bin/rm -rf ${CDROM} ${.OBJDIR}/cd-dir
diff --git a/distrib/vax/iso/Makefile b/distrib/vax/iso/Makefile
index 0ca14b6e2bb..0dc588f8e5e 100644
--- a/distrib/vax/iso/Makefile
+++ b/distrib/vax/iso/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2014/01/12 21:58:00 deraadt Exp $
+# $OpenBSD: Makefile,v 1.11 2014/01/24 00:34:22 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -41,10 +41,12 @@ ${CDROM}: ${BASE} ${XBASE} ${BOOT} ${BOOTXX}
cp ${BOOT} ${MOUNT_POINT}/
cp ${RELDIR}/bsd.rd ${MOUNT_POINT}/bsd
mkdir -p ${MOUNT_POINT}/${OSREV}/${MACHINE}
+
cp -p ${BASE} ${MOUNT_POINT}/${OSREV}/${MACHINE}
cp -p ${XBASE} ${MOUNT_POINT}/${OSREV}/${MACHINE}
- cat ${RELDIR}/SHA256 ${RELXDIR}/SHA256 > \
- ${MOUNT_POINT}/${OSREV}/${MACHINE}/SHA256
+ cp -p ${RELDIR}/.i-SHA256 ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256
+ cp -p ${RELDIR}/.i-SHA256.sig ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256.sig
+
disklabel -B -b ${BOOTXX} ${VND}
@echo ""
@df -i ${MOUNT_POINT}
@@ -55,11 +57,6 @@ ${CDROM}: ${BASE} ${XBASE} ${BOOT} ${BOOTXX}
install:
cp ${CDROM} ${RELDIR}/
- # update the SHA256 file
- grep -v ${CDROM} ${RELDIR}/SHA256 > ${RELDIR}/SHA256.new
- sum -a sha256 ${CDROM} >> ${RELDIR}/SHA256.new
- sort ${RELDIR}/SHA256.new > ${RELDIR}/SHA256
- rm ${RELDIR}/SHA256.new
clean cleandir:
/bin/rm -f ${CDROM} ${.OBJDIR}/image.*
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 11:43:24 +0000