From eda905b6e3ea0af49c6f6054554ec6b934ba9a62 Mon Sep 17 00:00:00 2001 From: deraadt <> Date: Tue, 17 Aug 2010 19:17:14 +0000 Subject: [PATCH] MDEXT missed some files (result was they are not listed in the build-time SHA256 file). Issue spotted by claudio. ok miod --- src/etc/etc.alpha/Makefile.inc | 5 +++-- src/etc/etc.amd64/Makefile.inc | 6 +++--- src/etc/etc.hppa/Makefile.inc | 5 +++-- src/etc/etc.hppa64/Makefile.inc | 5 +++-- src/etc/etc.landisk/Makefile.inc | 4 ++-- src/etc/etc.macppc/Makefile.inc | 4 ++-- src/etc/etc.mvme68k/Makefile.inc | 5 +++-- src/etc/etc.mvme88k/Makefile.inc | 6 +++--- src/etc/etc.sgi/Makefile.inc | 4 ++-- src/etc/etc.socppc/Makefile.inc | 4 ++-- src/etc/etc.sparc/Makefile.inc | 6 ++++-- src/etc/etc.sparc64/Makefile.inc | 6 +++--- src/etc/etc.vax/Makefile.inc | 4 ++-- 13 files changed, 35 insertions(+), 29 deletions(-) diff --git a/src/etc/etc.alpha/Makefile.inc b/src/etc/etc.alpha/Makefile.inc index f5620f70..f136fb8c 100644 --- a/src/etc/etc.alpha/Makefile.inc +++ b/src/etc/etc.alpha/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.17 2009/04/21 09:12:26 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.18 2010/08/17 19:17:12 deraadt Exp $ kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/alpha/compile/GENERIC/bsd \ @@ -14,7 +14,8 @@ bootblocks: cp ${DESTDIR}/usr/mdec/bootxx ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/netboot ${RELEASEDIR} -MDEXT= bsd bsd.rd cd${OSrev}.iso floppy${OSrev}.fs floppyB${OSrev}.fs \ +MDEXT= bsd bsd.rd cd${OSrev}.iso install${OSrev}.iso \ + floppy${OSrev}.fs floppyB${OSrev}.fs \ boot bootxx netboot .PHONY: bsd bootblocks diff --git a/src/etc/etc.amd64/Makefile.inc b/src/etc/etc.amd64/Makefile.inc index 4853f7cd..6acd6d6b 100644 --- a/src/etc/etc.amd64/Makefile.inc +++ b/src/etc/etc.amd64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.9 2009/04/21 09:12:26 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.10 2010/08/17 19:17:14 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 floppy${OSrev}.fs \ - pxeboot cdboot cdbr +MDEXT= bsd bsd.mp bsd.rd cd${OSrev}.iso install${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 f00f128a..c063fc18 100644 --- a/src/etc/etc.hppa/Makefile.inc +++ b/src/etc/etc.hppa/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.7 2009/04/21 09:12:26 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.8 2010/08/17 19:17:14 deraadt Exp $ kernels: bootblocks bsd cp ${.CURDIR}/../sys/arch/hppa/compile/GENERIC/bsd \ @@ -12,6 +12,7 @@ bsd: bootblocks: cp ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR} -MDEXT= bsd bsd.rd cd${OSrev}.iso xxboot +MDEXT= bsd bsd.rd cd${OSrev}.iso install${OSrev}.iso lif${OSrev}.fs \ + xxboot .PHONY: bsd bootblocks diff --git a/src/etc/etc.hppa64/Makefile.inc b/src/etc/etc.hppa64/Makefile.inc index 6a449462..6966b157 100644 --- a/src/etc/etc.hppa64/Makefile.inc +++ b/src/etc/etc.hppa64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.4 2009/04/21 09:12:26 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.5 2010/08/17 19:17:14 deraadt Exp $ kernels: bootblocks bsd cp ${.CURDIR}/../sys/arch/hppa64/compile/GENERIC/bsd \ @@ -12,6 +12,7 @@ bsd: bootblocks: cp ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR} -MDEXT= bsd bsd.rd xxboot +MDEXT= bsd bsd.rd cd${OSrev}.iso install${OSrev}.iso lif${OSrev}.fs \ + xxboot .PHONY: bootblocks bsd diff --git a/src/etc/etc.landisk/Makefile.inc b/src/etc/etc.landisk/Makefile.inc index 4980262c..1e484ab8 100644 --- a/src/etc/etc.landisk/Makefile.inc +++ b/src/etc/etc.landisk/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.5 2009/04/21 09:12:26 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.6 2010/08/17 19:17:14 deraadt Exp $ kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/landisk/compile/GENERIC/bsd \ @@ -14,6 +14,6 @@ bootblocks: cp ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR} -MDEXT= bsd mbr bsd.rd xxboot boot +MDEXT= bsd mbr bsd.rd xxboot boot miniroot${OSrev}.fs .PHONY: bsd bootblocks diff --git a/src/etc/etc.macppc/Makefile.inc b/src/etc/etc.macppc/Makefile.inc index 82a475e2..861a5d0a 100644 --- a/src/etc/etc.macppc/Makefile.inc +++ b/src/etc/etc.macppc/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.12 2009/04/21 09:12:27 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.13 2010/08/17 19:17:14 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 \ +MDEXT= bsd bsd.mp bsd.rd cd${OSrev}.iso install${OSrev}.iso \ ofwboot bsd.tbxi boot.mac .PHONY: bsd bsd.mp bootblocks diff --git a/src/etc/etc.mvme68k/Makefile.inc b/src/etc/etc.mvme68k/Makefile.inc index 332f984c..85b8897f 100644 --- a/src/etc/etc.mvme68k/Makefile.inc +++ b/src/etc/etc.mvme68k/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.11 2009/04/21 09:12:27 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.12 2010/08/17 19:17:14 deraadt Exp $ kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/mvme68k/compile/GENERIC/bsd \ @@ -12,6 +12,7 @@ bsd: bootblocks: cp ${DESTDIR}/usr/mdec/* ${RELEASEDIR}/ -MDEXT= bsd bsd.rd installboot netboot rboot sboot stboot +MDEXT= bsd bsd.rd \ + installboot netboot rboot sboot stboot bootsd bootst bootxx .PHONY: bsd bootblocks diff --git a/src/etc/etc.mvme88k/Makefile.inc b/src/etc/etc.mvme88k/Makefile.inc index 9f6a5590..04151159 100644 --- a/src/etc/etc.mvme88k/Makefile.inc +++ b/src/etc/etc.mvme88k/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.11 2009/07/28 19:30:07 miod Exp $ +# $OpenBSD: Makefile.inc,v 1.12 2010/08/17 19:17:14 deraadt Exp $ kernels: bsd bsd.mp bootblocks cp ${.CURDIR}/../sys/arch/mvme88k/compile/GENERIC/bsd \ @@ -19,7 +19,7 @@ bsd.mp: bootblocks: cp ${DESTDIR}/usr/mdec/* ${RELEASEDIR}/ -MDEXT= bsd bsd.mp bsd.rd -MDEXT+= bootsd bootst bootxx installboot netboot stboot tftpboot +MDEXT= bsd bsd.mp bsd.rd \ + bootsd bootst bootxx installboot netboot stboot tftpboot .PHONY: bsd bsd.mp bootblocks diff --git a/src/etc/etc.sgi/Makefile.inc b/src/etc/etc.sgi/Makefile.inc index 28b3690e..90f11219 100644 --- a/src/etc/etc.sgi/Makefile.inc +++ b/src/etc/etc.sgi/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.10 2010/01/19 19:55:53 miod Exp $ +# $OpenBSD: Makefile.inc,v 1.11 2010/08/17 19:17:14 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 + boot32 boot64 cd${OSrev}.iso install${OSrev}.iso .PHONY: bsd bootblocks diff --git a/src/etc/etc.socppc/Makefile.inc b/src/etc/etc.socppc/Makefile.inc index 9742bbf3..fd36cd00 100644 --- a/src/etc/etc.socppc/Makefile.inc +++ b/src/etc/etc.socppc/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.4 2010/02/13 19:39:56 kettenis Exp $ +# $OpenBSD: Makefile.inc,v 1.5 2010/08/17 19:17:14 deraadt Exp $ kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/socppc/compile/GENERIC/bsd \ @@ -13,6 +13,6 @@ bootblocks: cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}/boot cp ${DESTDIR}/usr/mdec/boot.elf ${RELEASEDIR}/boot.elf -MDEXT= bsd bsd.rd boot boot.elf +MDEXT= bsd bsd.bin bsd.rd boot boot.elf miniroot${OSrev}.fs .PHONY: bsd bootblocks diff --git a/src/etc/etc.sparc/Makefile.inc b/src/etc/etc.sparc/Makefile.inc index 940dd9db..534b366f 100644 --- a/src/etc/etc.sparc/Makefile.inc +++ b/src/etc/etc.sparc/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.16 2009/04/21 09:12:29 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.17 2010/08/17 19:17:14 deraadt Exp $ kernels: bsd bootblocks cp ${.CURDIR}/../sys/arch/sparc/compile/GENERIC/bsd \ @@ -18,6 +18,8 @@ bootblocks: ${DESTDIR}/usr/mdec/binstall net /tmp && \ mv /tmp/boot.sparc.openbsd ${RELEASEDIR}/boot.net -MDEXT= bsd bsd.rd bsd.scsi3 boot boot.net bootxx installboot +MDEXT= bsd bsd.rd bsd.scsi3 cd${OSrev}.iso install${OSrev}.iso \ + floppy${OSrev}.fs miniroot${OSrev}.fs \ + boot boot.net bootxx installboot .PHONY: bsd bootblocks diff --git a/src/etc/etc.sparc64/Makefile.inc b/src/etc/etc.sparc64/Makefile.inc index 677cbeaa..010ba246 100644 --- a/src/etc/etc.sparc64/Makefile.inc +++ b/src/etc/etc.sparc64/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.7 2009/04/21 09:12:29 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.8 2010/08/17 19:17:14 deraadt Exp $ kernels: bsd bsd.mp bootblocks cp ${.CURDIR}/../sys/arch/sparc64/compile/GENERIC/bsd \ @@ -19,8 +19,8 @@ bsd.mp: bootblocks: cp ${DESTDIR}/usr/mdec/*boot* ${RELEASEDIR} -MDEXT= bsd bsd.mp bsd.rd cd${OSrev}.iso miniroot${OSrev}.fs \ - floppy${OSrev}.fs floppyB${OSrev}.fs \ +MDEXT= bsd bsd.mp bsd.rd cd${OSrev}.iso install${OSrev}.iso \ + miniroot${OSrev}.fs floppy${OSrev}.fs floppyB${OSrev}.fs \ bootblk installboot ofwboot ofwboot.net .PHONY: bsd bsd.mp bootblocks diff --git a/src/etc/etc.vax/Makefile.inc b/src/etc/etc.vax/Makefile.inc index 12323574..7737a79c 100644 --- a/src/etc/etc.vax/Makefile.inc +++ b/src/etc/etc.vax/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.8 2009/04/21 09:12:29 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.9 2010/08/17 19:17:14 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 +MDEXT= bsd bsd.rd boot.mop cd${OSrev}.iso install${OSrev}.iso floppy${OSrev}.fs .PHONY: bsd bootblocks