From 52acc35760a09a8c76c3796dd296e14eacc6e5e9 Mon Sep 17 00:00:00 2001 From: deraadt <> Date: Fri, 14 Jan 2011 17:18:50 +0000 Subject: [PATCH] We should not sum the install*.iso file, since it is not created at build time. We've been summing the one from the previous build (then additional goo I run has been cleaning it up..) --- src/etc/etc.alpha/Makefile.inc | 4 ++-- src/etc/etc.amd64/Makefile.inc | 4 ++-- src/etc/etc.hppa/Makefile.inc | 4 ++-- src/etc/etc.hppa64/Makefile.inc | 4 ++-- src/etc/etc.macppc/Makefile.inc | 4 ++-- src/etc/etc.sgi/Makefile.inc | 4 ++-- src/etc/etc.sparc/Makefile.inc | 4 ++-- src/etc/etc.sparc64/Makefile.inc | 4 ++-- src/etc/etc.vax/Makefile.inc | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/etc/etc.alpha/Makefile.inc b/src/etc/etc.alpha/Makefile.inc index f136fb8c..fc6351e5 100644 --- a/src/etc/etc.alpha/Makefile.inc +++ b/src/etc/etc.alpha/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.18 2010/08/17 19:17:12 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.19 2011/01/14 17:18:49 deraadt Exp $ kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/alpha/compile/GENERIC/bsd \ @@ -14,7 +14,7 @@ bootblocks: cp ${DESTDIR}/usr/mdec/bootxx ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/netboot ${RELEASEDIR} -MDEXT= bsd bsd.rd cd${OSrev}.iso install${OSrev}.iso \ +MDEXT= bsd bsd.rd cd${OSrev}.iso \ floppy${OSrev}.fs floppyB${OSrev}.fs \ boot bootxx netboot diff --git a/src/etc/etc.amd64/Makefile.inc b/src/etc/etc.amd64/Makefile.inc index 6acd6d6b..d92b060c 100644 --- a/src/etc/etc.amd64/Makefile.inc +++ b/src/etc/etc.amd64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.10 2010/08/17 19:17:14 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.11 2011/01/14 17:18:50 deraadt Exp $ kernels: bsd bsd.mp bootblocks cp ${.CURDIR}/../sys/arch/amd64/compile/GENERIC/bsd \ @@ -21,7 +21,7 @@ bootblocks: cp ${DESTDIR}/usr/mdec/cdboot ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/cdbr ${RELEASEDIR} -MDEXT= bsd bsd.mp bsd.rd cd${OSrev}.iso install${OSrev}.iso \ +MDEXT= bsd bsd.mp bsd.rd cd${OSrev}.iso \ floppy${OSrev}.fs pxeboot cdboot cdbr .PHONY: bsd bsd.mp bootblocks diff --git a/src/etc/etc.hppa/Makefile.inc b/src/etc/etc.hppa/Makefile.inc index bab8aecd..53973dc5 100644 --- a/src/etc/etc.hppa/Makefile.inc +++ b/src/etc/etc.hppa/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.9 2010/12/30 19:22:26 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.10 2011/01/14 17:18:50 deraadt Exp $ kernels: bootblocks bsd bsd.mp cp ${.CURDIR}/../sys/arch/hppa/compile/GENERIC/bsd \ @@ -19,7 +19,7 @@ bsd.mp: bootblocks: cp ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR} -MDEXT= bsd bsd.mp bsd.rd cd${OSrev}.iso install${OSrev}.iso lif${OSrev}.fs \ +MDEXT= bsd bsd.mp bsd.rd cd${OSrev}.iso lif${OSrev}.fs \ xxboot .PHONY: bsd bsd.mp bootblocks diff --git a/src/etc/etc.hppa64/Makefile.inc b/src/etc/etc.hppa64/Makefile.inc index 6966b157..91e5f621 100644 --- a/src/etc/etc.hppa64/Makefile.inc +++ b/src/etc/etc.hppa64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.5 2010/08/17 19:17:14 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.6 2011/01/14 17:18:50 deraadt Exp $ kernels: bootblocks bsd cp ${.CURDIR}/../sys/arch/hppa64/compile/GENERIC/bsd \ @@ -12,7 +12,7 @@ bsd: bootblocks: cp ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR} -MDEXT= bsd bsd.rd cd${OSrev}.iso install${OSrev}.iso lif${OSrev}.fs \ +MDEXT= bsd bsd.rd cd${OSrev}.iso lif${OSrev}.fs \ xxboot .PHONY: bootblocks bsd diff --git a/src/etc/etc.macppc/Makefile.inc b/src/etc/etc.macppc/Makefile.inc index 861a5d0a..90224fc6 100644 --- a/src/etc/etc.macppc/Makefile.inc +++ b/src/etc/etc.macppc/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.13 2010/08/17 19:17:14 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.14 2011/01/14 17:18:50 deraadt Exp $ kernels: bsd bsd.mp bootblocks cp ${.CURDIR}/../sys/arch/macppc/compile/GENERIC/bsd \ @@ -21,7 +21,7 @@ bootblocks: cp ${DESTDIR}/usr/mdec/bsd.tbxi ${RELEASEDIR}/bsd.tbxi cp ${DESTDIR}/usr/mdec/boot.mac ${RELEASEDIR}/boot.mac -MDEXT= bsd bsd.mp bsd.rd cd${OSrev}.iso install${OSrev}.iso \ +MDEXT= bsd bsd.mp bsd.rd cd${OSrev}.iso \ ofwboot bsd.tbxi boot.mac .PHONY: bsd bsd.mp bootblocks diff --git a/src/etc/etc.sgi/Makefile.inc b/src/etc/etc.sgi/Makefile.inc index 90f11219..1e99da20 100644 --- a/src/etc/etc.sgi/Makefile.inc +++ b/src/etc/etc.sgi/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.11 2010/08/17 19:17:14 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.12 2011/01/14 17:18:50 deraadt Exp $ kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/sgi/compile/GENERIC-IP27/bsd \ @@ -30,6 +30,6 @@ bootblocks: MDEXT= bsd.IP27 bsd.rd.IP27 bsd.IP30 bsd.mp.IP30 bsd.rd.IP30 \ bsd.IP32 bsd.rd.IP32 \ - boot32 boot64 cd${OSrev}.iso install${OSrev}.iso + boot32 boot64 cd${OSrev}.iso .PHONY: bsd bootblocks diff --git a/src/etc/etc.sparc/Makefile.inc b/src/etc/etc.sparc/Makefile.inc index 534b366f..4c96c7b3 100644 --- a/src/etc/etc.sparc/Makefile.inc +++ b/src/etc/etc.sparc/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.17 2010/08/17 19:17:14 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.18 2011/01/14 17:18:50 deraadt Exp $ kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/sparc/compile/GENERIC/bsd \ @@ -18,7 +18,7 @@ bootblocks: ${DESTDIR}/usr/mdec/binstall net /tmp && \ mv /tmp/boot.sparc.openbsd ${RELEASEDIR}/boot.net -MDEXT= bsd bsd.rd bsd.scsi3 cd${OSrev}.iso install${OSrev}.iso \ +MDEXT= bsd bsd.rd bsd.scsi3 cd${OSrev}.iso \ floppy${OSrev}.fs miniroot${OSrev}.fs \ boot boot.net bootxx installboot diff --git a/src/etc/etc.sparc64/Makefile.inc b/src/etc/etc.sparc64/Makefile.inc index 010ba246..e38c410f 100644 --- a/src/etc/etc.sparc64/Makefile.inc +++ b/src/etc/etc.sparc64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.8 2010/08/17 19:17:14 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.9 2011/01/14 17:18:50 deraadt Exp $ kernels: bsd bsd.mp bootblocks cp ${.CURDIR}/../sys/arch/sparc64/compile/GENERIC/bsd \ @@ -19,7 +19,7 @@ bsd.mp: bootblocks: cp ${DESTDIR}/usr/mdec/*boot* ${RELEASEDIR} -MDEXT= bsd bsd.mp bsd.rd cd${OSrev}.iso install${OSrev}.iso \ +MDEXT= bsd bsd.mp bsd.rd cd${OSrev}.iso \ miniroot${OSrev}.fs floppy${OSrev}.fs floppyB${OSrev}.fs \ bootblk installboot ofwboot ofwboot.net diff --git a/src/etc/etc.vax/Makefile.inc b/src/etc/etc.vax/Makefile.inc index 7737a79c..da260f8a 100644 --- a/src/etc/etc.vax/Makefile.inc +++ b/src/etc/etc.vax/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.9 2010/08/17 19:17:14 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.10 2011/01/14 17:18:50 deraadt Exp $ kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/vax/compile/GENERIC/bsd \ @@ -12,6 +12,6 @@ bsd: bootblocks: mopa.out ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}/boot.mop -MDEXT= bsd bsd.rd boot.mop cd${OSrev}.iso install${OSrev}.iso floppy${OSrev}.fs +MDEXT= bsd bsd.rd boot.mop cd${OSrev}.iso floppy${OSrev}.fs .PHONY: bsd bootblocks