Browse Source

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..)
OPENBSD_4_9
deraadt 14 years ago
parent
commit
52acc35760
9 changed files with 18 additions and 18 deletions
  1. +2
    -2
      src/etc/etc.alpha/Makefile.inc
  2. +2
    -2
      src/etc/etc.amd64/Makefile.inc
  3. +2
    -2
      src/etc/etc.hppa/Makefile.inc
  4. +2
    -2
      src/etc/etc.hppa64/Makefile.inc
  5. +2
    -2
      src/etc/etc.macppc/Makefile.inc
  6. +2
    -2
      src/etc/etc.sgi/Makefile.inc
  7. +2
    -2
      src/etc/etc.sparc/Makefile.inc
  8. +2
    -2
      src/etc/etc.sparc64/Makefile.inc
  9. +2
    -2
      src/etc/etc.vax/Makefile.inc

+ 2
- 2
src/etc/etc.alpha/Makefile.inc View File

@ -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 kernels: bsd bootblocks
cp ${.CURDIR}/../sys/arch/alpha/compile/GENERIC/bsd \ cp ${.CURDIR}/../sys/arch/alpha/compile/GENERIC/bsd \
@ -14,7 +14,7 @@ bootblocks:
cp ${DESTDIR}/usr/mdec/bootxx ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/bootxx ${RELEASEDIR}
cp ${DESTDIR}/usr/mdec/netboot ${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 \ floppy${OSrev}.fs floppyB${OSrev}.fs \
boot bootxx netboot boot bootxx netboot


+ 2
- 2
src/etc/etc.amd64/Makefile.inc View File

@ -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 kernels: bsd bsd.mp bootblocks
cp ${.CURDIR}/../sys/arch/amd64/compile/GENERIC/bsd \ cp ${.CURDIR}/../sys/arch/amd64/compile/GENERIC/bsd \
@ -21,7 +21,7 @@ bootblocks:
cp ${DESTDIR}/usr/mdec/cdboot ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/cdboot ${RELEASEDIR}
cp ${DESTDIR}/usr/mdec/cdbr ${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 floppy${OSrev}.fs pxeboot cdboot cdbr
.PHONY: bsd bsd.mp bootblocks .PHONY: bsd bsd.mp bootblocks

+ 2
- 2
src/etc/etc.hppa/Makefile.inc View File

@ -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 kernels: bootblocks bsd bsd.mp
cp ${.CURDIR}/../sys/arch/hppa/compile/GENERIC/bsd \ cp ${.CURDIR}/../sys/arch/hppa/compile/GENERIC/bsd \
@ -19,7 +19,7 @@ bsd.mp:
bootblocks: bootblocks:
cp ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR} 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 xxboot
.PHONY: bsd bsd.mp bootblocks .PHONY: bsd bsd.mp bootblocks

+ 2
- 2
src/etc/etc.hppa64/Makefile.inc View File

@ -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 kernels: bootblocks bsd
cp ${.CURDIR}/../sys/arch/hppa64/compile/GENERIC/bsd \ cp ${.CURDIR}/../sys/arch/hppa64/compile/GENERIC/bsd \
@ -12,7 +12,7 @@ bsd:
bootblocks: bootblocks:
cp ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR} 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 xxboot
.PHONY: bootblocks bsd .PHONY: bootblocks bsd

+ 2
- 2
src/etc/etc.macppc/Makefile.inc View File

@ -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 kernels: bsd bsd.mp bootblocks
cp ${.CURDIR}/../sys/arch/macppc/compile/GENERIC/bsd \ 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/bsd.tbxi ${RELEASEDIR}/bsd.tbxi
cp ${DESTDIR}/usr/mdec/boot.mac ${RELEASEDIR}/boot.mac 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 ofwboot bsd.tbxi boot.mac
.PHONY: bsd bsd.mp bootblocks .PHONY: bsd bsd.mp bootblocks


+ 2
- 2
src/etc/etc.sgi/Makefile.inc View File

@ -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 kernels: bsd bootblocks
cp ${.CURDIR}/../sys/arch/sgi/compile/GENERIC-IP27/bsd \ 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 \ MDEXT= bsd.IP27 bsd.rd.IP27 bsd.IP30 bsd.mp.IP30 bsd.rd.IP30 \
bsd.IP32 bsd.rd.IP32 \ bsd.IP32 bsd.rd.IP32 \
boot32 boot64 cd${OSrev}.iso install${OSrev}.iso
boot32 boot64 cd${OSrev}.iso
.PHONY: bsd bootblocks .PHONY: bsd bootblocks

+ 2
- 2
src/etc/etc.sparc/Makefile.inc View File

@ -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 kernels: bsd bootblocks
cp ${.CURDIR}/../sys/arch/sparc/compile/GENERIC/bsd \ cp ${.CURDIR}/../sys/arch/sparc/compile/GENERIC/bsd \
@ -18,7 +18,7 @@ bootblocks:
${DESTDIR}/usr/mdec/binstall net /tmp && \ ${DESTDIR}/usr/mdec/binstall net /tmp && \
mv /tmp/boot.sparc.openbsd ${RELEASEDIR}/boot.net 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 \ floppy${OSrev}.fs miniroot${OSrev}.fs \
boot boot.net bootxx installboot boot boot.net bootxx installboot


+ 2
- 2
src/etc/etc.sparc64/Makefile.inc View File

@ -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 kernels: bsd bsd.mp bootblocks
cp ${.CURDIR}/../sys/arch/sparc64/compile/GENERIC/bsd \ cp ${.CURDIR}/../sys/arch/sparc64/compile/GENERIC/bsd \
@ -19,7 +19,7 @@ bsd.mp:
bootblocks: bootblocks:
cp ${DESTDIR}/usr/mdec/*boot* ${RELEASEDIR} 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 \ miniroot${OSrev}.fs floppy${OSrev}.fs floppyB${OSrev}.fs \
bootblk installboot ofwboot ofwboot.net bootblk installboot ofwboot ofwboot.net


+ 2
- 2
src/etc/etc.vax/Makefile.inc View File

@ -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 kernels: bsd bootblocks
cp ${.CURDIR}/../sys/arch/vax/compile/GENERIC/bsd \ cp ${.CURDIR}/../sys/arch/vax/compile/GENERIC/bsd \
@ -12,6 +12,6 @@ bsd:
bootblocks: bootblocks:
mopa.out ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}/boot.mop 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 .PHONY: bsd bootblocks

Loading…
Cancel
Save