diff options
| author |   deraadt <deraadt@openbsd.org> | 2014-01-24 00:34:22 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2014-01-24 00:34:22 +0000 |
| commit | a29dc4be12bc9f5c4e37c212ac029584175f2c05 (patch) | |
| tree | 5eaf521a71e84e8119e1531471a80ab9f59c2f42 /distrib/i386 | |
| parent | Man page update for Areca driver update (diff) | |
| download | wireguard-openbsd-a29dc4be12bc9f5c4e37c212ac029584175f2c05.tar.xz wireguard-openbsd-a29dc4be12bc9f5c4e37c212ac029584175f2c05.zip | |
Refactor the install*.iso creation in regards to signing.
ok todd
Diffstat (limited to 'distrib/i386')
| -rw-r--r-- | distrib/i386/iso/Makefile | 12 |
1 files changed, 3 insertions, 9 deletions
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} |