From 63bc38f0c13fe053be1180a3e23adaa86ccd1e9d Mon Sep 17 00:00:00 2001 From: deraadt Date: Sun, 12 Jan 2014 21:57:59 +0000 Subject: [PATCH] Place a SHA256 (not SHA256.sig, sorry not yet) onto the install*.iso media to give some upcoming changes a chance of working. Long discussions with todd and rpe --- distrib/alpha/iso/Makefile | 5 ++++- distrib/amd64/iso/Makefile | 5 ++++- distrib/hppa/iso/Makefile | 5 ++++- distrib/i386/iso/Makefile | 5 ++++- distrib/macppc/iso/Makefile | 5 ++++- distrib/sgi/iso/Makefile | 5 ++++- distrib/sparc/iso/Makefile | 6 +++++- distrib/sparc64/iso/Makefile | 5 ++++- distrib/vax/iso/Makefile | 4 +++- 9 files changed, 36 insertions(+), 9 deletions(-) diff --git a/distrib/alpha/iso/Makefile b/distrib/alpha/iso/Makefile index 5cd903f2046..284cde46c00 100644 --- a/distrib/alpha/iso/Makefile +++ b/distrib/alpha/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2011/04/18 16:52:09 thib Exp $ +# $OpenBSD: Makefile,v 1.10 2014/01/12 21:57:59 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -33,6 +33,9 @@ ${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" \ diff --git a/distrib/amd64/iso/Makefile b/distrib/amd64/iso/Makefile index 3c708771c1f..15069c3953b 100644 --- a/distrib/amd64/iso/Makefile +++ b/distrib/amd64/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/10/18 05:40:47 deraadt Exp $ +# $OpenBSD: Makefile,v 1.7 2014/01/12 21:58:00 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -31,6 +31,9 @@ ${CDROM}: ${BASE} ${XBASE} 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" \ diff --git a/distrib/hppa/iso/Makefile b/distrib/hppa/iso/Makefile index 14a7f33a2ee..912688a60de 100644 --- a/distrib/hppa/iso/Makefile +++ b/distrib/hppa/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2011/04/18 16:52:09 thib Exp $ +# $OpenBSD: Makefile,v 1.10 2014/01/12 21:58:00 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -26,6 +26,9 @@ ${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 + 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 efd1690de8c..8da79ff1976 100644 --- a/distrib/i386/iso/Makefile +++ b/distrib/i386/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/10/18 05:40:47 deraadt Exp $ +# $OpenBSD: Makefile,v 1.7 2014/01/12 21:58:00 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -31,6 +31,9 @@ ${CDROM}: ${BASE} ${XBASE} 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" \ diff --git a/distrib/macppc/iso/Makefile b/distrib/macppc/iso/Makefile index 3fe18518889..9291bc15746 100644 --- a/distrib/macppc/iso/Makefile +++ b/distrib/macppc/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2010/10/18 05:40:47 deraadt Exp $ +# $OpenBSD: Makefile,v 1.9 2014/01/12 21:58:00 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -30,6 +30,9 @@ ${CDROM}: ${BASE} ${XBASE} ${.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} \ -map ${.CURDIR}/../../../gnu/usr.sbin/mkhybrid/src/more.mapping \ diff --git a/distrib/sgi/iso/Makefile b/distrib/sgi/iso/Makefile index 18d965b6f11..7689559e9f8 100644 --- a/distrib/sgi/iso/Makefile +++ b/distrib/sgi/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2014/01/06 21:03:13 miod Exp $ +# $OpenBSD: Makefile,v 1.20 2014/01/12 21:58:00 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -97,6 +97,9 @@ ${CDROM}: cp -p ${XBASE} ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE} + cat ${RELDIR}/SHA256 ${RELXDIR}/SHA256 > \ + ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/SHA256 + umount ${.OBJDIR}/cd-dir # Summary diff --git a/distrib/sparc/iso/Makefile b/distrib/sparc/iso/Makefile index 70acdc35ac8..b9d9afd7e3c 100644 --- a/distrib/sparc/iso/Makefile +++ b/distrib/sparc/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2011/06/08 19:16:19 krw Exp $ +# $OpenBSD: Makefile,v 1.10 2014/01/12 21:58:00 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -31,6 +31,10 @@ ${CDROM}: ${BASE} ${XBASE} 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} \ diff --git a/distrib/sparc64/iso/Makefile b/distrib/sparc64/iso/Makefile index 4e16b9b701e..5660c02a858 100644 --- a/distrib/sparc64/iso/Makefile +++ b/distrib/sparc64/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2011/06/08 19:16:19 krw Exp $ +# $OpenBSD: Makefile,v 1.12 2014/01/12 21:58:00 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -28,6 +28,9 @@ ${CDROM}: ${BASE} ${XBASE} 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 diff --git a/distrib/vax/iso/Makefile b/distrib/vax/iso/Makefile index 961e3245caa..0ca14b6e2bb 100644 --- a/distrib/vax/iso/Makefile +++ b/distrib/vax/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2013/07/16 17:31:39 deraadt Exp $ +# $OpenBSD: Makefile,v 1.10 2014/01/12 21:58:00 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -43,6 +43,8 @@ ${CDROM}: ${BASE} ${XBASE} ${BOOT} ${BOOTXX} 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 disklabel -B -b ${BOOTXX} ${VND} @echo "" @df -i ${MOUNT_POINT} -- 2.20.1