Browse Source

unify kernel building on various platforms.

feedback from miod@ and deraadt@
OPENBSD_5_0
espie 13 years ago
parent
commit
74427696fc
23 changed files with 79 additions and 342 deletions
  1. +22
    -3
      src/etc/Makefile
  2. +2
    -13
      src/etc/etc.alpha/Makefile.inc
  3. +3
    -20
      src/etc/etc.amd64/Makefile.inc
  4. +2
    -13
      src/etc/etc.armish/Makefile.inc
  5. +2
    -13
      src/etc/etc.aviion/Makefile.inc
  6. +2
    -13
      src/etc/etc.hp300/Makefile.inc
  7. +3
    -20
      src/etc/etc.hppa/Makefile.inc
  8. +2
    -14
      src/etc/etc.hppa64/Makefile.inc
  9. +4
    -18
      src/etc/etc.i386/Makefile.inc
  10. +2
    -13
      src/etc/etc.landisk/Makefile.inc
  11. +2
    -12
      src/etc/etc.loongson/Makefile.inc
  12. +4
    -13
      src/etc/etc.luna88k/Makefile.inc
  13. +4
    -12
      src/etc/etc.mac68k/Makefile.inc
  14. +3
    -21
      src/etc/etc.macppc/Makefile.inc
  15. +2
    -13
      src/etc/etc.mvme68k/Makefile.inc
  16. +3
    -19
      src/etc/etc.mvme88k/Makefile.inc
  17. +2
    -13
      src/etc/etc.palm/Makefile.inc
  18. +4
    -28
      src/etc/etc.sgi/Makefile.inc
  19. +2
    -13
      src/etc/etc.socppc/Makefile.inc
  20. +2
    -13
      src/etc/etc.sparc/Makefile.inc
  21. +3
    -19
      src/etc/etc.sparc64/Makefile.inc
  22. +2
    -13
      src/etc/etc.vax/Makefile.inc
  23. +2
    -13
      src/etc/etc.zaurus/Makefile.inc

+ 22
- 3
src/etc/Makefile View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.308 2011/07/17 00:28:04 david Exp $
# $OpenBSD: Makefile,v 1.309 2011/07/22 09:30:54 espie Exp $
TZDIR= /usr/share/zoneinfo TZDIR= /usr/share/zoneinfo
LOCALTIME= Canada/Mountain LOCALTIME= Canada/Mountain
@ -6,10 +6,27 @@ MTREEDIR= /etc/mtree
NOOBJ= NOOBJ=
KERNELS = GENERIC bsd
.if exists(etc.${MACHINE}/Makefile.inc) .if exists(etc.${MACHINE}/Makefile.inc)
.include "etc.${MACHINE}/Makefile.inc" .include "etc.${MACHINE}/Makefile.inc"
.endif .endif
.for CONF K in ${KERNELS}
. if !target($K)
$K:
cd ../sys/arch/${MACHINE}/conf && config ${CONF}
cd ../sys/arch/${MACHINE}/compile/${CONF} && \
${MAKE} clean && exec ${MAKE}
. endif
ALL_KERNELS += $K
.endfor
kernels: bootblocks ${ALL_KERNELS}
.for CONF K in ${KERNELS}
cp ../sys/arch/${MACHINE}/compile/${CONF}/bsd ${RELEASEDIR}/$K
.endfor
# -rw-r--r-- # -rw-r--r--
BINOWN= root BINOWN= root
BINGRP= wheel BINGRP= wheel
@ -295,7 +312,7 @@ release-sets:
sha: sha:
-cd ${RELEASEDIR}; \ -cd ${RELEASEDIR}; \
sum -a sha256 INSTALL.`arch -ks` ${MDEXT} ${MISETS} > SHA256
sum -a sha256 INSTALL.`arch -ks` ${ALL_KERNELS} ${MDEXT} ${MISETS} > SHA256
release: distribution kernels release-sets distrib sha release: distribution kernels release-sets distrib sha
@ -319,7 +336,9 @@ update-moduli:
) > moduli ) > moduli
.PHONY: distribution-etc-root-var distribution distrib-dirs \ .PHONY: distribution-etc-root-var distribution distrib-dirs \
release allarchs kernels release-sets m4 install-mtree
release allarchs kernels release-sets m4 install-mtree \
bootblocks ${ALL_KERNELS}
SUBDIR+= etc.alpha etc.amd64 etc.armish etc.aviion etc.hp300 etc.hppa SUBDIR+= etc.alpha etc.amd64 etc.armish etc.aviion etc.hp300 etc.hppa
SUBDIR+= etc.hppa64 etc.i386 etc.landisk etc.loongson etc.luna88k SUBDIR+= etc.hppa64 etc.i386 etc.landisk etc.loongson etc.luna88k


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

@ -1,21 +1,10 @@
# $OpenBSD: Makefile.inc,v 1.20 2011/04/15 03:11:38 deraadt Exp $
kernels: bsd bootblocks
cp ${.CURDIR}/../sys/arch/alpha/compile/GENERIC/bsd \
${RELEASEDIR}/bsd
bsd:
cd ${.CURDIR}/../sys/arch/alpha/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/alpha/compile/GENERIC && \
${MAKE} clean && exec ${MAKE}
# $OpenBSD: Makefile.inc,v 1.21 2011/07/22 09:30:54 espie Exp $
bootblocks: bootblocks:
cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}
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 \
MDEXT= bsd.rd cd${OSrev}.iso \
floppy${OSrev}.fs floppyB${OSrev}.fs \ floppy${OSrev}.fs floppyB${OSrev}.fs \
boot bootxx netboot boot bootxx netboot
.PHONY: bsd bootblocks

+ 3
- 20
src/etc/etc.amd64/Makefile.inc View File

@ -1,27 +1,10 @@
# $OpenBSD: Makefile.inc,v 1.12 2011/04/15 03:11:38 deraadt Exp $
# $OpenBSD: Makefile.inc,v 1.13 2011/07/22 09:30:54 espie Exp $
kernels: bsd bsd.mp bootblocks
cp ${.CURDIR}/../sys/arch/amd64/compile/GENERIC/bsd \
${RELEASEDIR}/bsd
cp ${.CURDIR}/../sys/arch/amd64/compile/GENERIC.MP/bsd \
${RELEASEDIR}/bsd.mp
bsd:
cd ${.CURDIR}/../sys/arch/amd64/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/amd64/compile/GENERIC && \
${MAKE} clean && exec ${MAKE}
bsd.mp:
cd ${.CURDIR}/../sys/arch/amd64/conf && config GENERIC.MP
cd ${.CURDIR}/../sys/arch/amd64/compile/GENERIC.MP && \
${MAKE} clean && exec ${MAKE}
KERNELS += GENERIC.MP bsd.mp
bootblocks: bootblocks:
cp ${DESTDIR}/usr/mdec/pxeboot ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/pxeboot ${RELEASEDIR}
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 \
floppy${OSrev}.fs pxeboot cdboot cdbr
.PHONY: bsd bsd.mp bootblocks
MDEXT= bsd.rd cd${OSrev}.iso floppy${OSrev}.fs pxeboot cdboot cdbr

+ 2
- 13
src/etc/etc.armish/Makefile.inc View File

@ -1,17 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.8 2011/04/15 03:11:38 deraadt Exp $
kernels: bsd bootblocks
cp ${.CURDIR}/../sys/arch/armish/compile/GENERIC/bsd \
${RELEASEDIR}/bsd
bsd:
cd ${.CURDIR}/../sys/arch/armish/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/armish/compile/GENERIC && \
${MAKE} clean && exec ${MAKE}
# $OpenBSD: Makefile.inc,v 1.9 2011/07/22 09:30:54 espie Exp $
bootblocks: bootblocks:
cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}
MDEXT= bsd bsd.rd boot
.PHONY: bsd bootblocks
MDEXT= bsd.rd boot

+ 2
- 13
src/etc/etc.aviion/Makefile.inc View File

@ -1,17 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.5 2011/04/15 03:11:38 deraadt Exp $
kernels: bsd bootblocks
cp ${.CURDIR}/../sys/arch/aviion/compile/GENERIC/bsd \
${RELEASEDIR}/bsd
bsd:
cd ${.CURDIR}/../sys/arch/aviion/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/aviion/compile/GENERIC && \
${MAKE} clean && ${MAKE}
# $OpenBSD: Makefile.inc,v 1.6 2011/07/22 09:30:54 espie Exp $
bootblocks: bootblocks:
cp ${DESTDIR}/usr/mdec/* ${RELEASEDIR}/ cp ${DESTDIR}/usr/mdec/* ${RELEASEDIR}/
MDEXT= bsd bsd.rd # bootblocks?
.PHONY: bsd bootblocks
MDEXT= bsd.rd # bootblocks?

+ 2
- 13
src/etc/etc.hp300/Makefile.inc View File

@ -1,18 +1,7 @@
# $OpenBSD: Makefile.inc,v 1.22 2011/04/15 03:11:38 deraadt Exp $
kernels: bsd bootblocks
cp ${.CURDIR}/../sys/arch/hp300/compile/GENERIC/bsd \
${RELEASEDIR}/bsd
bsd:
cd ${.CURDIR}/../sys/arch/hp300/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/hp300/compile/GENERIC && \
${MAKE} clean && exec ${MAKE}
# $OpenBSD: Makefile.inc,v 1.23 2011/07/22 09:30:54 espie Exp $
bootblocks: bootblocks:
cp ${DESTDIR}/usr/mdec/uboot.lif ${RELEASEDIR}/SYS_UBOOT cp ${DESTDIR}/usr/mdec/uboot.lif ${RELEASEDIR}/SYS_UBOOT
cp ${DESTDIR}/usr/mdec/cdboot.lif ${RELEASEDIR}/SYS_CDBOOT cp ${DESTDIR}/usr/mdec/cdboot.lif ${RELEASEDIR}/SYS_CDBOOT
MDEXT= bsd bsd.rd SYS_UBOOT SYS_CDBOOT
.PHONY: bsd bootblocks
MDEXT= bsd.rd SYS_UBOOT SYS_CDBOOT

+ 3
- 20
src/etc/etc.hppa/Makefile.inc View File

@ -1,25 +1,8 @@
# $OpenBSD: Makefile.inc,v 1.11 2011/04/15 03:11:38 deraadt Exp $
# $OpenBSD: Makefile.inc,v 1.12 2011/07/22 09:30:54 espie Exp $
kernels: bootblocks bsd bsd.mp
cp ${.CURDIR}/../sys/arch/hppa/compile/GENERIC/bsd \
${RELEASEDIR}/bsd
cp ${.CURDIR}/../sys/arch/hppa/compile/GENERIC.MP/bsd \
${RELEASEDIR}/bsd.mp
bsd:
cd ${.CURDIR}/../sys/arch/hppa/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/hppa/compile/GENERIC && \
${MAKE} clean && exec ${MAKE}
bsd.mp:
cd ${.CURDIR}/../sys/arch/hppa/conf && config GENERIC.MP
cd ${.CURDIR}/../sys/arch/hppa/compile/GENERIC.MP && \
${MAKE} clean && exec ${MAKE}
KERNELS += GENERIC.MP 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 lif${OSrev}.fs \
xxboot
.PHONY: bsd bsd.mp bootblocks
MDEXT= bsd.rd cd${OSrev}.iso lif${OSrev}.fs xxboot

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

@ -1,18 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.7 2011/04/15 03:11:38 deraadt Exp $
kernels: bootblocks bsd
cp ${.CURDIR}/../sys/arch/hppa64/compile/GENERIC/bsd \
${RELEASEDIR}/bsd
bsd:
cd ${.CURDIR}/../sys/arch/hppa64/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/hppa64/compile/GENERIC && \
${MAKE} clean && exec ${MAKE}
# $OpenBSD: Makefile.inc,v 1.8 2011/07/22 09:30:54 espie Exp $
bootblocks: bootblocks:
cp ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR}
MDEXT= bsd bsd.rd cd${OSrev}.iso lif${OSrev}.fs \
xxboot
.PHONY: bootblocks bsd
MDEXT= bsd.rd cd${OSrev}.iso lif${OSrev}.fs xxboot

+ 4
- 18
src/etc/etc.i386/Makefile.inc View File

@ -1,20 +1,8 @@
# $OpenBSD: Makefile.inc,v 1.19 2011/04/15 03:11:38 deraadt Exp $
# $OpenBSD: Makefile.inc,v 1.20 2011/07/22 09:30:54 espie Exp $
kernels: bsd bsd.mp bootblocks linux-notes
cp ${.CURDIR}/../sys/arch/i386/compile/GENERIC/bsd \
${RELEASEDIR}/bsd
cp ${.CURDIR}/../sys/arch/i386/compile/GENERIC.MP/bsd \
${RELEASEDIR}/bsd.mp
KERNELS += GENERIC.MP bsd.mp
bsd:
cd ${.CURDIR}/../sys/arch/i386/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/i386/compile/GENERIC && \
${MAKE} clean && exec ${MAKE}
bsd.mp:
cd ${.CURDIR}/../sys/arch/i386/conf && config GENERIC.MP
cd ${.CURDIR}/../sys/arch/i386/compile/GENERIC.MP && \
${MAKE} clean && exec ${MAKE}
kernels: linux-notes
bootblocks: bootblocks:
cp ${DESTDIR}/usr/mdec/pxeboot ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/pxeboot ${RELEASEDIR}
@ -24,8 +12,6 @@ bootblocks:
linux-notes: linux-notes:
cp ${.CURDIR}/etc.i386/INSTALL.* ${RELEASEDIR} cp ${.CURDIR}/etc.i386/INSTALL.* ${RELEASEDIR}
MDEXT= bsd bsd.mp bsd.rd cd${OSrev}.iso cdemu${OSrev}.iso \
MDEXT= bsd.rd cd${OSrev}.iso cdemu${OSrev}.iso \
floppy${OSrev}.fs floppyB${OSrev}.fs floppyC${OSrev}.fs \ floppy${OSrev}.fs floppyB${OSrev}.fs floppyC${OSrev}.fs \
pxeboot cdboot cdbr INSTALL.linux pxeboot cdboot cdbr INSTALL.linux
.PHONY: bsd bsd.mp bootblocks

+ 2
- 13
src/etc/etc.landisk/Makefile.inc View File

@ -1,19 +1,8 @@
# $OpenBSD: Makefile.inc,v 1.7 2011/04/15 03:11:38 deraadt Exp $
kernels: bsd bootblocks
cp ${.CURDIR}/../sys/arch/landisk/compile/GENERIC/bsd \
${RELEASEDIR}/bsd
bsd:
cd ${.CURDIR}/../sys/arch/landisk/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/landisk/compile/GENERIC && \
${MAKE} clean && exec ${MAKE}
# $OpenBSD: Makefile.inc,v 1.8 2011/07/22 09:30:54 espie Exp $
bootblocks: bootblocks:
cp ${DESTDIR}/usr/mdec/mbr ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/mbr ${RELEASEDIR}
cp ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/xxboot ${RELEASEDIR}
cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}
MDEXT= bsd mbr bsd.rd xxboot boot miniroot${OSrev}.fs
.PHONY: bsd bootblocks
MDEXT= mbr bsd.rd xxboot boot miniroot${OSrev}.fs

+ 2
- 12
src/etc/etc.loongson/Makefile.inc View File

@ -1,16 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.4 2011/04/15 03:11:38 deraadt Exp $
kernels: bsd bootblocks
cp ${.CURDIR}/../sys/arch/loongson/compile/GENERIC/bsd \
${RELEASEDIR}/bsd
bsd:
cd ${.CURDIR}/../sys/arch/loongson/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/loongson/compile/GENERIC && \
${MAKE} clean && exec ${MAKE}
# $OpenBSD: Makefile.inc,v 1.5 2011/07/22 09:30:54 espie Exp $
bootblocks: bootblocks:
cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}
MDEXT= bsd bsd.rd boot miniroot${OSrev}.fs
.PHONY: bsd bootblocks
MDEXT= bsd.rd boot miniroot${OSrev}.fs

+ 4
- 13
src/etc/etc.luna88k/Makefile.inc View File

@ -1,15 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.5 2011/04/15 03:11:38 deraadt Exp $
# $OpenBSD: Makefile.inc,v 1.6 2011/07/22 09:30:54 espie Exp $
kernels: bsd
cp ${.CURDIR}/../sys/arch/luna88k/compile/GENERIC/bsd \
${RELEASEDIR}/bsd
bsd:
cd ${.CURDIR}/../sys/arch/luna88k/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/luna88k/compile/GENERIC && \
${MAKE} clean && ${MAKE}
MDEXT= bsd bsd.rd
.PHONY: bsd
bootblocks:
# XXX no bootblocks ?
MDEXT= bsd.rd

+ 4
- 12
src/etc/etc.mac68k/Makefile.inc View File

@ -1,14 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.14 2011/04/15 03:11:38 deraadt Exp $
# $OpenBSD: Makefile.inc,v 1.15 2011/07/22 09:30:54 espie Exp $
kernels: bsd
cp ${.CURDIR}/../sys/arch/mac68k/compile/GENERIC/bsd \
${RELEASEDIR}/bsd
bootblocks:
# XXX no bootblocks ?
bsd:
cd ${.CURDIR}/../sys/arch/mac68k/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/mac68k/compile/GENERIC && \
${MAKE} clean && exec ${MAKE}
MDEXT= bsd bsd.rd # utils??
.PHONY: bsd
MDEXT= bsd.rd # utils??

+ 3
- 21
src/etc/etc.macppc/Makefile.inc View File

@ -1,28 +1,10 @@
# $OpenBSD: Makefile.inc,v 1.15 2011/04/15 03:11:38 deraadt Exp $
# $OpenBSD: Makefile.inc,v 1.16 2011/07/22 09:30:54 espie Exp $
kernels: bsd bsd.mp bootblocks
cp ${.CURDIR}/../sys/arch/macppc/compile/GENERIC/bsd \
${RELEASEDIR}/bsd
cp ${.CURDIR}/../sys/arch/macppc/compile/GENERIC.MP/bsd \
${RELEASEDIR}/bsd.mp
bsd:
cd ${.CURDIR}/../sys/arch/macppc/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/macppc/compile/GENERIC && \
${MAKE} clean && exec ${MAKE}
bsd.mp:
cd ${.CURDIR}/../sys/arch/macppc/conf && config GENERIC.MP
cd ${.CURDIR}/../sys/arch/macppc/compile/GENERIC.MP && \
${MAKE} clean && exec ${MAKE}
KERNELS += GENERIC.MP bsd.mp
bootblocks: bootblocks:
cp ${DESTDIR}/usr/mdec/ofwboot ${RELEASEDIR}/ofwboot cp ${DESTDIR}/usr/mdec/ofwboot ${RELEASEDIR}/ofwboot
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 \
ofwboot bsd.tbxi boot.mac
.PHONY: bsd bsd.mp bootblocks
MDEXT= bsd.rd cd${OSrev}.iso ofwboot bsd.tbxi boot.mac

+ 2
- 13
src/etc/etc.mvme68k/Makefile.inc View File

@ -1,18 +1,7 @@
# $OpenBSD: Makefile.inc,v 1.13 2011/04/15 03:11:38 deraadt Exp $
kernels: bsd bootblocks
cp ${.CURDIR}/../sys/arch/mvme68k/compile/GENERIC/bsd \
${RELEASEDIR}/bsd
bsd:
cd ${.CURDIR}/../sys/arch/mvme68k/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/mvme68k/compile/GENERIC && \
${MAKE} clean && exec ${MAKE}
# $OpenBSD: Makefile.inc,v 1.14 2011/07/22 09:30:54 espie Exp $
bootblocks: bootblocks:
cp ${DESTDIR}/usr/mdec/* ${RELEASEDIR}/ cp ${DESTDIR}/usr/mdec/* ${RELEASEDIR}/
MDEXT= bsd bsd.rd \
MDEXT= bsd.rd \
installboot netboot rboot sboot stboot bootsd bootst bootxx installboot netboot rboot sboot stboot bootsd bootst bootxx
.PHONY: bsd bootblocks

+ 3
- 19
src/etc/etc.mvme88k/Makefile.inc View File

@ -1,25 +1,9 @@
# $OpenBSD: Makefile.inc,v 1.13 2011/04/15 03:11:38 deraadt Exp $
# $OpenBSD: Makefile.inc,v 1.14 2011/07/22 09:30:54 espie Exp $
kernels: bsd bsd.mp bootblocks
cp ${.CURDIR}/../sys/arch/mvme88k/compile/GENERIC/bsd \
${RELEASEDIR}/bsd
cp ${.CURDIR}/../sys/arch/mvme88k/compile/GENERIC.MP/bsd \
${RELEASEDIR}/bsd.mp
bsd:
cd ${.CURDIR}/../sys/arch/mvme88k/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/mvme88k/compile/GENERIC && \
${MAKE} clean && ${MAKE}
bsd.mp:
cd ${.CURDIR}/../sys/arch/mvme88k/conf && config GENERIC.MP
cd ${.CURDIR}/../sys/arch/mvme88k/compile/GENERIC.MP && \
${MAKE} clean && ${MAKE}
KERNELS += CONFIG.MP bsd.mp
bootblocks: bootblocks:
cp ${DESTDIR}/usr/mdec/* ${RELEASEDIR}/ cp ${DESTDIR}/usr/mdec/* ${RELEASEDIR}/
MDEXT= bsd bsd.mp bsd.rd \
MDEXT= bsd.rd \
bootsd bootst bootxx installboot netboot stboot tftpboot bootsd bootst bootxx installboot netboot stboot tftpboot
.PHONY: bsd bsd.mp bootblocks

+ 2
- 13
src/etc/etc.palm/Makefile.inc View File

@ -1,18 +1,7 @@
# $OpenBSD: Makefile.inc,v 1.2 2011/04/15 03:11:38 deraadt Exp $
kernels: bsd bootblocks
cp ${.CURDIR}/../sys/arch/palm/compile/GENERIC/bsd \
${RELEASEDIR}/bsd
bsd:
cd ${.CURDIR}/../sys/arch/palm/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/palm/compile/GENERIC && \
${MAKE} clean && exec ${MAKE}
# $OpenBSD: Makefile.inc,v 1.3 2011/07/22 09:30:54 espie Exp $
bootblocks: bootblocks:
cp ${DESTDIR}/usr/mdec/zboot ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/zboot ${RELEASEDIR}
cp ${DESTDIR}/usr/mdec/zbsdmod.o ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/zbsdmod.o ${RELEASEDIR}
MDEXT= bsd bsd.rd Packages
.PHONY: bsd bootblocks
MDEXT= bsd.rd Packages

+ 4
- 28
src/etc/etc.sgi/Makefile.inc View File

@ -1,35 +1,11 @@
# $OpenBSD: Makefile.inc,v 1.13 2011/04/15 03:11:38 deraadt Exp $
# $OpenBSD: Makefile.inc,v 1.14 2011/07/22 09:30:54 espie Exp $
kernels: bsd bootblocks
cp ${.CURDIR}/../sys/arch/sgi/compile/GENERIC-IP27/bsd \
${RELEASEDIR}/bsd.IP27
cp ${.CURDIR}/../sys/arch/sgi/compile/GENERIC-IP30/bsd \
${RELEASEDIR}/bsd.IP30
cp ${.CURDIR}/../sys/arch/sgi/compile/GENERIC-IP30.MP/bsd \
${RELEASEDIR}/bsd.mp.IP30
cp ${.CURDIR}/../sys/arch/sgi/compile/GENERIC-IP32/bsd \
${RELEASEDIR}/bsd.IP32
bsd:
cd ${.CURDIR}/../sys/arch/sgi/conf && config GENERIC-IP27
cd ${.CURDIR}/../sys/arch/sgi/compile/GENERIC-IP27 && \
${MAKE} clean && exec ${MAKE}
cd ${.CURDIR}/../sys/arch/sgi/conf && config GENERIC-IP30
cd ${.CURDIR}/../sys/arch/sgi/compile/GENERIC-IP30 && \
${MAKE} clean && exec ${MAKE}
cd ${.CURDIR}/../sys/arch/sgi/conf && config GENERIC-IP30.MP
cd ${.CURDIR}/../sys/arch/sgi/compile/GENERIC-IP30.MP && \
${MAKE} clean && exec ${MAKE}
cd ${.CURDIR}/../sys/arch/sgi/conf && config GENERIC-IP32
cd ${.CURDIR}/../sys/arch/sgi/compile/GENERIC-IP32 && \
${MAKE} clean && exec ${MAKE}
KERNELS = GENERIC-IP27 bsd.IP27 GENERIC-IP30 bsd.IP30 \
GENERIC-IP30.MP bsd.mp.IP30 GENERIC-IP32 bsd.IP32
bootblocks: bootblocks:
cp ${DESTDIR}/usr/mdec/boot32 ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/boot32 ${RELEASEDIR}
cp ${DESTDIR}/usr/mdec/boot64 ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/boot64 ${RELEASEDIR}
MDEXT= bsd.IP27 bsd.rd.IP27 bsd.IP30 bsd.mp.IP30 bsd.rd.IP30 \
bsd.IP32 bsd.rd.IP32 \
MDEXT= bsd.rd.IP27 bsd.rd.IP30 bsd.rd.IP32 \
boot32 boot64 cd${OSrev}.iso boot32 boot64 cd${OSrev}.iso
.PHONY: bsd bootblocks

+ 2
- 13
src/etc/etc.socppc/Makefile.inc View File

@ -1,18 +1,7 @@
# $OpenBSD: Makefile.inc,v 1.6 2011/04/15 03:11:38 deraadt Exp $
kernels: bsd bootblocks
cp ${.CURDIR}/../sys/arch/socppc/compile/GENERIC/bsd \
${RELEASEDIR}/bsd
bsd:
cd ${.CURDIR}/../sys/arch/socppc/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/socppc/compile/GENERIC && \
${MAKE} clean && exec ${MAKE}
# $OpenBSD: Makefile.inc,v 1.7 2011/07/22 09:30:54 espie Exp $
bootblocks: bootblocks:
cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}/boot cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR}/boot
cp ${DESTDIR}/usr/mdec/boot.elf ${RELEASEDIR}/boot.elf cp ${DESTDIR}/usr/mdec/boot.elf ${RELEASEDIR}/boot.elf
MDEXT= bsd bsd.bin bsd.rd boot boot.elf miniroot${OSrev}.fs
.PHONY: bsd bootblocks
MDEXT= bsd.bin bsd.rd boot boot.elf miniroot${OSrev}.fs

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

@ -1,21 +1,10 @@
# $OpenBSD: Makefile.inc,v 1.20 2011/06/15 21:36:50 miod Exp $
kernels: bsd bootblocks
cp ${.CURDIR}/../sys/arch/sparc/compile/GENERIC/bsd \
${RELEASEDIR}/bsd
bsd:
cd ${.CURDIR}/../sys/arch/sparc/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/sparc/compile/GENERIC && \
${MAKE} clean && exec ${MAKE}
# $OpenBSD: Makefile.inc,v 1.21 2011/07/22 09:30:54 espie Exp $
bootblocks: bootblocks:
cp ${DESTDIR}/usr/mdec/*boot* ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/*boot* ${RELEASEDIR}
${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 cd${OSrev}.iso \
MDEXT= bsd.rd 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
.PHONY: bsd bootblocks

+ 3
- 19
src/etc/etc.sparc64/Makefile.inc View File

@ -1,26 +1,10 @@
# $OpenBSD: Makefile.inc,v 1.10 2011/04/15 03:11:38 deraadt Exp $
# $OpenBSD: Makefile.inc,v 1.11 2011/07/22 09:30:54 espie Exp $
kernels: bsd bsd.mp bootblocks
cp ${.CURDIR}/../sys/arch/sparc64/compile/GENERIC/bsd \
${RELEASEDIR}/bsd
cp ${.CURDIR}/../sys/arch/sparc64/compile/GENERIC.MP/bsd \
${RELEASEDIR}/bsd.mp
bsd:
cd ${.CURDIR}/../sys/arch/sparc64/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/sparc64/compile/GENERIC && \
${MAKE} clean && exec ${MAKE}
bsd.mp:
cd ${.CURDIR}/../sys/arch/sparc64/conf && config GENERIC.MP
cd ${.CURDIR}/../sys/arch/sparc64/compile/GENERIC.MP && \
${MAKE} clean && ${MAKE} depend && exec ${MAKE}
KERNELS += GENERIC.MP 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 \
MDEXT= 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
.PHONY: bsd bsd.mp bootblocks

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

@ -1,17 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.11 2011/04/15 03:11:38 deraadt Exp $
kernels: bsd bootblocks
cp ${.CURDIR}/../sys/arch/vax/compile/GENERIC/bsd \
${RELEASEDIR}/bsd
bsd:
cd ${.CURDIR}/../sys/arch/vax/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/vax/compile/GENERIC && \
${MAKE} clean && exec ${MAKE}
# $OpenBSD: Makefile.inc,v 1.12 2011/07/22 09:30:54 espie Exp $
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 floppy${OSrev}.fs
.PHONY: bsd bootblocks
MDEXT= bsd.rd boot.mop cd${OSrev}.iso floppy${OSrev}.fs

+ 2
- 13
src/etc/etc.zaurus/Makefile.inc View File

@ -1,18 +1,7 @@
# $OpenBSD: Makefile.inc,v 1.10 2011/04/15 03:11:38 deraadt Exp $
kernels: bsd bootblocks
cp ${.CURDIR}/../sys/arch/zaurus/compile/GENERIC/bsd \
${RELEASEDIR}/bsd
bsd:
cd ${.CURDIR}/../sys/arch/zaurus/conf && config GENERIC
cd ${.CURDIR}/../sys/arch/zaurus/compile/GENERIC && \
${MAKE} clean && exec ${MAKE}
# $OpenBSD: Makefile.inc,v 1.11 2011/07/22 09:30:54 espie Exp $
bootblocks: bootblocks:
cp ${DESTDIR}/usr/mdec/zboot ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/zboot ${RELEASEDIR}
cp ${DESTDIR}/usr/mdec/zbsdmod.o ${RELEASEDIR} cp ${DESTDIR}/usr/mdec/zbsdmod.o ${RELEASEDIR}
MDEXT= bsd bsd.rd zboot zbsdmod.o openbsd${OSrev}_arm.ipk Packages
.PHONY: bsd bootblocks
MDEXT= bsd.rd zboot zbsdmod.o openbsd${OSrev}_arm.ipk Packages

Loading…
Cancel
Save