diff options
| -rw-r--r-- | distrib/alpha/common/install.md | 5 | ||||
| -rw-r--r-- | distrib/alpha/iso/Makefile | 4 | ||||
| -rw-r--r-- | distrib/notes/alpha/contents | 4 | ||||
| -rw-r--r-- | distrib/notes/alpha/features | 4 | ||||
| -rw-r--r-- | distrib/notes/alpha/hardware | 7 | ||||
| -rw-r--r-- | distrib/notes/alpha/prep | 4 | ||||
| -rw-r--r-- | etc/etc.alpha/Makefile.inc | 4 |
7 files changed, 18 insertions, 14 deletions
diff --git a/distrib/alpha/common/install.md b/distrib/alpha/common/install.md index 40d813a3bc1..00cc8b5e99c 100644 --- a/distrib/alpha/common/install.md +++ b/distrib/alpha/common/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.36 2013/11/16 18:37:26 rpe Exp $ +# $OpenBSD: install.md,v 1.37 2014/02/03 05:35:40 miod Exp $ # # Copyright (c) 1996 The NetBSD Foundation, Inc. # All rights reserved. @@ -32,6 +32,9 @@ # MDXAPERTURE=1 +NCPU=$(sysctl -n hw.ncpufound) + +((NCPU > 1)) && { DEFAULTSETS="bsd bsd.rd bsd.mp" ; SANESETS="bsd bsd.mp" ; } md_installboot() { # Use cat to avoid holes created by cp(1) diff --git a/distrib/alpha/iso/Makefile b/distrib/alpha/iso/Makefile index c1ed34a72ff..f860ab43497 100644 --- a/distrib/alpha/iso/Makefile +++ b/distrib/alpha/iso/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2014/01/24 00:34:22 deraadt Exp $ +# $OpenBSD: Makefile,v 1.12 2014/02/03 05:35:40 miod Exp $ TOP= ${.CURDIR}/.. @@ -11,7 +11,7 @@ RELDIR?= /home/rel-${MACHINE} BASE= ${RELDIR}/base${OSrev}.tgz ${RELDIR}/comp${OSrev}.tgz \ ${RELDIR}/etc${OSrev}.tgz ${RELDIR}/game${OSrev}.tgz \ ${RELDIR}/man${OSrev}.tgz \ - ${RELDIR}/bsd ${RELDIR}/bsd.rd \ + ${RELDIR}/bsd ${RELDIR}/bsd.rd ${RELDIR}/bsd.mp \ ${RELDIR}/INSTALL.${MACHINE} XBASE= ${RELXDIR}/xbase${OSrev}.tgz ${RELXDIR}/xetc${OSrev}.tgz \ ${RELXDIR}/xfont${OSrev}.tgz ${RELXDIR}/xshare${OSrev}.tgz \ diff --git a/distrib/notes/alpha/contents b/distrib/notes/alpha/contents index 84e756cc80a..1dd871a1dfd 100644 --- a/distrib/notes/alpha/contents +++ b/distrib/notes/alpha/contents @@ -1,4 +1,4 @@ -dnl $OpenBSD: contents,v 1.54 2013/07/26 20:07:29 miod Exp $ +dnl $OpenBSD: contents,v 1.55 2014/02/03 05:35:40 miod Exp $ TopPart OpenBSDfloppy @@ -34,6 +34,8 @@ OpenBSDdistsets OpenBSDbsd +OpenBSDbsdmp + OpenBSDrd OpenBSDinstalliso diff --git a/distrib/notes/alpha/features b/distrib/notes/alpha/features index 029ead7e348..b70996b6f57 100644 --- a/distrib/notes/alpha/features +++ b/distrib/notes/alpha/features @@ -1,4 +1,4 @@ -dnl $OpenBSD: features,v 1.1 2009/05/12 21:06:50 miod Exp $ +dnl $OpenBSD: features,v 1.2 2014/02/03 05:35:40 miod Exp $ dnl dnl This file lists almost all the conditional features of this port, dnl which are used to provide accurate installation notes. @@ -21,7 +21,7 @@ dnl (i.e. md_consoleinfo is not empty) define({:-MDSERCONS-:},1)dnl dnl dnl define if SMP kernels are provided -define({:-MDSMP-:},)dnl +define({:-MDSMP-:},1)dnl dnl dnl define if shared libraries are provided define({:-MDSO-:},1)dnl diff --git a/distrib/notes/alpha/hardware b/distrib/notes/alpha/hardware index d27a9151478..d7c64719d9b 100644 --- a/distrib/notes/alpha/hardware +++ b/distrib/notes/alpha/hardware @@ -1,4 +1,4 @@ -dnl $OpenBSD: hardware,v 1.107 2013/08/20 14:27:24 ajacoutot Exp $ +dnl $OpenBSD: hardware,v 1.108 2014/02/03 05:35:40 miod Exp $ OpenBSD/MACHINE OSREV is expected to run on the following hardware. If you have hardware that is listed here and are unable to run OpenBSD, or if you are able to run OpenBSD on hardware not listed here, please @@ -16,8 +16,7 @@ Supported hardware: Floppy drive. XP900, XP1000, CS20, DS10, DS20, DS20L, ES40, 264DP, and other EV6 - machines using the Tsunami chipset (only one processor on multiprocessor - models will be used) + machines using the Tsunami chipset Supported devices: Built-in serial and parallel ports. Built-in DEC21143 Ethernet. @@ -171,8 +170,6 @@ dnl move to PCMCIA section once Multia PCMCIA has been tested EB64+ based systems Samsung 164BX and 164UX (no SRM) VME Alpha systems (AXPvme, ALPHAvme) - Multiprocessor Alpha systems (though they will run fine using one - processor only, if the model is listed as supported above) Supported Peripherals: diff --git a/distrib/notes/alpha/prep b/distrib/notes/alpha/prep index c1148a0105b..29fda76e463 100644 --- a/distrib/notes/alpha/prep +++ b/distrib/notes/alpha/prep @@ -1,4 +1,4 @@ -dnl $OpenBSD: prep,v 1.31 2013/02/25 20:08:27 miod Exp $ +dnl $OpenBSD: prep,v 1.32 2014/02/03 05:35:40 miod Exp $ OpenBSD/MACHINE requires the SRM console. Some alphas come with the AlphaBIOS (also known as the ARC firmware on older machines) instead; this is what Windows NT uses. It is fairly simple to replace the AlphaBIOS @@ -86,7 +86,7 @@ Using the SRM console: when rebooted (shutdown -r), and will not restart when halted (shutdown -h). - Most users will want to set this to "boot". + Most users will want to set this to "restart". bootdef_dev Default boot device (or list of devices). diff --git a/etc/etc.alpha/Makefile.inc b/etc/etc.alpha/Makefile.inc index d92ebbae37f..8c4f887853a 100644 --- a/etc/etc.alpha/Makefile.inc +++ b/etc/etc.alpha/Makefile.inc @@ -1,4 +1,6 @@ -# $OpenBSD: Makefile.inc,v 1.22 2013/03/09 17:25:25 deraadt Exp $ +# $OpenBSD: Makefile.inc,v 1.23 2014/02/03 05:35:40 miod Exp $ + +KERNELS += GENERIC.MP bsd.mp bootblocks: cp ${DESTDIR}/usr/mdec/boot ${RELEASEDIR} |